External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-14 07:27:28 -02:30
Code Issues Packages Projects Releases Wiki Activity

Socket.js

Browse Source 
adding check in socket service functions to ensure that socket exists before checking the status of hte socket connection
This commit is contained in:
Jared Tabor
2015-03-16 13:51:12 -04:00
parent d3134fea86
commit 83e9553015
1 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
awx/ui/static/js/shared/Socket.js
View File

@@ -162,26 +162,38 @@ angular.module('SocketIO', ['AuthService', 'Utilities'])
checkStatus: function() {
// Check connection status
var self = this;
if (self.socket.socket.connected) {
self.scope.socketStatus = 'ok';
if(self){
if(self.socket){
if(self.socket.socket){
if (self.socket.socket.connected) {
self.scope.socketStatus = 'ok';
}
else if (self.socket.socket.connecting || self.socket.reconnecting) {
self.scope.socketStatus = 'connecting';
}
else {
self.scope.socketStatus = 'error';
}
self.scope.socketTip = getSocketTip(self.scope.socketStatus);
return self.scope.socketStatus;
}
}
}
else if (self.socket.socket.connecting || self.socket.reconnecting) {
self.scope.socketStatus = 'connecting';
}
else {
self.scope.socketStatus = 'error';
}
self.scope.socketTip = getSocketTip(self.scope.socketStatus);
return self.scope.socketStatus;
},
on: function (eventName, callback) {
var self = this;
self.socket.on(eventName, function () {
var args = arguments;
self.scope.$apply(function () {
callback.apply(self.socket, args);
if(self){
if(self.socket){
self.socket.on(eventName, function () {
var args = arguments;
self.scope.$apply(function () {
callback.apply(self.socket, args);
});
});
});
}
}
},
emit: function (eventName, data, callback) {
var self = this;