External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-26 16:11:30 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #409 from jaredevantabor/socket-fix

Browse Source 
move socketPromise.resolve() until handshake message is received
This commit is contained in:
Jared Tabor 2017-09-13 18:55:39 -07:00 committed by GitHub
commit acbf9f517b
1 changed files with 4 additions and 1 deletions
Show Stats 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 () {
$log.debug("Websocket connection opened.");
socketPromise.resolve();
self.checkStatus();
if(needsResubscribing){
self.subscribe(self.getLast());
@ -76,6 +75,10 @@ export default
$log.debug('Received From Server: ' + e.data);
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)){
// we know that this must have been a
// summary complete message b/c status is missing.