From 37e282735a6ea74bd9f6582fc3b9244a42637a86 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@ansible.com>
Date: Tue, 4 Oct 2016 13:58:54 -0700
Subject: [PATCH] fixing statusTip and socketStatus

---
 .../src/shared/socket/socket.service.js       | 36 ++++++-------------
 1 file changed, 10 insertions(+), 26 deletions(-)

diff --git a/awx/ui/client/src/shared/socket/socket.service.js b/awx/ui/client/src/shared/socket/socket.service.js
index e94045cb21..b2c98e7f01 100644
--- a/awx/ui/client/src/shared/socket/socket.service.js
+++ b/awx/ui/client/src/shared/socket/socket.service.js
@@ -30,13 +30,15 @@ export default
                         $log.debug('Websocket Error Logged: ' + error); //log errors
                     };
 
-                    self.socket.onclose = function (error) {
-                        $log.debug('Websocket Disconnected: '+error);
-                        self.checkStatus();
+                    self.socket.onclose = function () {
+                        $log.debug('Websocket Disconnected');
                     };
 
                     self.socket.onmessage = this.onMessage;
-
+                    setTimeout(function() {
+                            self.checkStatus();
+                            $log.debug('Socket Status: ' + $rootScope.socketStatus);
+                    }, 2000);
                     return self.socket;
                 }
                 else {
@@ -44,11 +46,6 @@ export default
                     $rootScope.sessionTimer.expireSession('idle');
                     $location.url('/login');
                 }
-
-                setTimeout(function() {
-                        self.checkStatus();
-                        $log.debug('socket status: ' + $rootScope.socketStatus);
-                }, 2000);
             },
             onMessage: function(e){
                 $log.debug('Received From Server: ' + e.data);
@@ -114,35 +111,22 @@ export default
                 }
             },
             checkStatus: function() {
-                function getSocketTip(status) {
-                    var result = '';
-                    switch(status) {
-                        case 'error':
-                            result = "Live events: error connecting to the Tower server.";
-                            break;
-                        case 'connecting':
-                            result = "Live events: attempting to connect to the Tower server.";
-                            break;
-                        case "ok":
-                            result = "Live events: connected. Pages containing job status information will automatically update in real-time.";
-                    }
-                    return result;
-                }
-                // Check connection status
                 var self = this;
                 if(self){
                     if(self.socket){
                         if (self.socket.readyState === 0 ) {
                             $rootScope.socketStatus = 'connecting';
+                            $rootScope.socketTip = "Live events: attempting to connect to the Tower server.";
                         }
                         else if (self.socket.readyState === 1){
                             $rootScope.socketStatus = 'ok';
+                            $rootScope.socketTip = "Live events: connected. Pages containing job status information will automatically update in real-time.";
                         }
                         else if (self.socket.readyState === 2 || self.socket.readyState === 3 ){
                             $rootScope.socketStatus = 'error';
+                            $rootScope.socketTip = "Live events: error connecting to the Tower server.";
                         }
-                        self.socketTip = getSocketTip(self.socketStatus);
-                        return $rootScope.socketStatus;
+                        return;
                     }
                 }