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

move socketPromise.resolve() until handshake message is received

Browse Source 
instead of happening after the socket.onopen event.
This commit is contained in:
Jared Tabor
2017-09-13 17:53:06 -07:00
parent 93927717c8
commit 9cf683ea75
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,6 @@ export default
self.socket.onopen = function () { self.socket.onopen = function () {
$log.debug("Websocket connection opened."); $log.debug("Websocket connection opened.");
socketPromise.resolve();
self.checkStatus(); self.checkStatus();
if(needsResubscribing){ if(needsResubscribing){
self.subscribe(self.getLast()); self.subscribe(self.getLast());
@@ -76,6 +75,10 @@ export default
$log.debug('Received From Server: ' + e.data); $log.debug('Received From Server: ' + e.data);
var data = JSON.parse(e.data), str = ""; var data = JSON.parse(e.data), str = "";
if(_.has(data, "accept") && data.accept === true){
socketPromise.resolve();
return;
}
if(data.group_name==="jobs" && !('status' in data)){ if(data.group_name==="jobs" && !('status' in data)){
// we know that this must have been a // we know that this must have been a
// summary complete message b/c status is missing. // summary complete message b/c status is missing.