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

Merge pull request #421 from jaredevantabor/socket-fix

Browse Source 
Socket Fix
This commit is contained in:
Jared Tabor
2017-09-15 15:58:58 -07:00
committed by GitHub
parent ca72722b39 f7312691e1
commit 2c7abc8bca
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,8 @@ export default
self.socket.onopen = function () { self.socket.onopen = function () {
$log.debug("Websocket connection opened."); $log.debug("Websocket connection opened.");
socketPromise.resolve();
console.log('promise resolved, and readyState: '+ self.readyState);
self.checkStatus(); self.checkStatus();
if(needsResubscribing){ if(needsResubscribing){
self.subscribe(self.getLast()); self.subscribe(self.getLast());
@@ -75,10 +77,6 @@ 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.
@@ -191,7 +189,10 @@ export default
var self = this; var self = this;
$log.debug('Sent to Websocket Server: ' + data); $log.debug('Sent to Websocket Server: ' + data);
socketPromise.promise.then(function(){ socketPromise.promise.then(function(){
console.log("socket readyState: " + self.socket.readyState); console.log("socket readyState at emit: " + self.socket.readyState);
if(self.socket.readyState === 0){
self.subscribe(self.getLast());
}
if(self.socket.readyState === 1){ if(self.socket.readyState === 1){
self.socket.send(data, function () { self.socket.send(data, function () {
var args = arguments; var args = arguments;