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

refactoring socket functions

Browse Source
This commit is contained in:
Jared Tabor
2016-08-31 10:44:00 -07:00
parent 813eeb9dd9
commit 0937866e20
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
awx/ui/client/src/shared/socket/socket.service.js
View File

@@ -21,13 +21,13 @@ export default
timeoutInterval: 3000,
maxReconnectAttempts: 10
});
self.socket.onopen = function () {
console.log('websocket connected'); //log errors
};
self.socket.onerror = function (error) {
console.log('Error Logged: ' + error); //log errors
};
// self.socket.onopen = function () {
// console.log('websocket connected'); //log errors
// };
//
// self.socket.onerror = function (error) {
// console.log('Error Logged: ' + error); //log errors
// };
self.socket.onmessage = function (e) {
console.log('Received From Server: ' + e.data);
var data = JSON.parse(e.data);
@@ -96,6 +96,11 @@ export default
$rootScope.sessionTimer.expireSession('idle');
$location.url('/login');
}
setTimeout(function() {
self.checkStatus();
$log.debug('socket status: ' + $rootScope.socketStatus);
}, 2000);
},
checkStatus: function() {
@@ -118,16 +123,16 @@ export default
if(self){
if(self.socket){
if (self.socket.readyState === 0 ) {
self.scope.socketStatus = 'connecting';
$rootScope.socketStatus = 'connecting';
}
else if (self.socket.readyState === 1){
self.scope.socketStatus = 'ok';
$rootScope.socketStatus = 'ok';
}
else if (self.socket.readyState === 2 || self.socket.readyState === 3 ){
self.scope.socketStatus = 'error';
$rootScope.socketStatus = 'error';
}
self.scope.socketTip = getSocketTip(self.scope.socketStatus);
return self.scope.socketStatus;
self.socketTip = getSocketTip(self.socketStatus);
return $rootScope.socketStatus;
}
}