External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 23:07:42 -02:30
Code Issues Packages Projects Releases Wiki Activity

Resubscribing the UI to the last group it was on, whenever a disconnect happens that

Browse Source 
was no intentional
This commit is contained in:
Jared Tabor
2016-10-05 14:10:40 -07:00
parent e80c99e737
commit 1b8b4a68b7
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,7 @@ import ReconnectingWebSocket from 'reconnectingwebsocket';
export default export default
['$rootScope', '$location', '$log','$state', ['$rootScope', '$location', '$log','$state',
function ($rootScope, $location, $log, $state) { function ($rootScope, $location, $log, $state) {
var needsResubscribing = false;
return { return {
init: function() { init: function() {
var self = this, var self = this,
@@ -25,6 +26,11 @@ export default
$log.debug("Websocket connection opened."); $log.debug("Websocket connection opened.");
$rootScope.socketPromise.resolve(); $rootScope.socketPromise.resolve();
self.checkStatus(); self.checkStatus();
if(needsResubscribing){
self.subscribe(self.getLast());
needsResubscribing = false;
}
}; };
self.socket.onerror = function (error) { self.socket.onerror = function (error) {
@@ -32,8 +38,15 @@ export default
$log.debug('Websocket Error Logged: ' + error); //log errors $log.debug('Websocket Error Logged: ' + error); //log errors
}; };
self.socket.onclose = function () { self.socket.onconnecting = function (event) {
$log.debug('Websocket Disconnected'); self.checkStatus();
$log.debug('Websocket reconnecting');
needsResubscribing = true;
};
self.socket.onclose = function (event) {
self.checkStatus();
$log.debug(`Websocket disconnected`);
}; };
self.socket.onmessage = this.onMessage; self.socket.onmessage = this.onMessage;