From 4bb223401969c81f80653145d28afb06fa60a284 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@ansible.com>
Date: Wed, 14 Sep 2016 16:10:22 -0700
Subject: [PATCH] removing old code

---
 .../src/job-detail/job-detail.controller.js   |  5 -----
 .../src/shared/socket/socket.service.js       | 22 ++++++-------------
 .../log/standard-out-log.controller.js        | 10 ---------
 3 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/awx/ui/client/src/job-detail/job-detail.controller.js b/awx/ui/client/src/job-detail/job-detail.controller.js
index b9f7edfca7..d7bd9c3457 100644
--- a/awx/ui/client/src/job-detail/job-detail.controller.js
+++ b/awx/ui/client/src/job-detail/job-detail.controller.js
@@ -214,11 +214,6 @@ export default
                     }
                     UpdateDOM({ scope: scope });
                 });
-                // Unbind $rootScope socket event binding(s) so that they don't get triggered
-                // in another instance of this controller
-                // scope.$on('$destroy', function() {
-                //     $rootScope.socket.removeAllListeners("job_events-" + job_id);
-                // });
             }
             openSocket();
 
diff --git a/awx/ui/client/src/shared/socket/socket.service.js b/awx/ui/client/src/shared/socket/socket.service.js
index 32cacbe7b0..49aa2dc1f9 100644
--- a/awx/ui/client/src/shared/socket/socket.service.js
+++ b/awx/ui/client/src/shared/socket/socket.service.js
@@ -22,16 +22,17 @@ export default
                     });
 
                     self.socket.onopen = function () {
-                        $log.debug("Websocket connection opened");
+                        $log.debug("Websocket connection opened.");
                         $rootScope.socketPromise.resolve();
                     };
 
                     self.socket.onerror = function (error) {
-                        $log.debug('Error Logged: ' + error); //log errors
+                        $log.debug('Websocket Error Logged: ' + error); //log errors
                     };
 
-                    self.socket.onclose = function () {
-                        $log.debug('Websocket Disconnected.');
+                    self.socket.onclose = function (error, obj) {
+                        $log.debug('Websocket Disconnected: '+error);
+                        self.checkStatus();
                     };
 
                     self.socket.onmessage = function (e) {
@@ -57,12 +58,11 @@ export default
                         else {
                             // The naming scheme is "ws" then a
                             // dash (-) and the group_name.
-                            // ex: 'ws-jobs' 
+                            // ex: 'ws-jobs'
                             str = `ws-${data.group_name}`;
                         }
                         $rootScope.$emit(str, data);
                         return self.socket;
-
                     };
 
                 }
@@ -159,14 +159,6 @@ export default
                         });
                     });
                 });
-            },
-            removeAllListeners: function (eventName) {
-                var self = this;
-                if(self){
-                  if(self.socket){
-                    self.socket.removeEventListener(eventName);
-                  }
-                }
-            },
+            }
         };
     }];
diff --git a/awx/ui/client/src/standard-out/log/standard-out-log.controller.js b/awx/ui/client/src/standard-out/log/standard-out-log.controller.js
index d997b5eb1f..fe494d5603 100644
--- a/awx/ui/client/src/standard-out/log/standard-out-log.controller.js
+++ b/awx/ui/client/src/standard-out/log/standard-out-log.controller.js
@@ -28,11 +28,6 @@ export default ['$log', '$rootScope', '$scope', '$state', '$stateParams', 'Proce
                        event_queue++;
                    }
                });
-               // Unbind $rootScope socket event binding(s) so that they don't get triggered
-               // in another instance of this controller
-            //    $scope.$on('$destroy', function() {
-            //        $rootScope.socket.removeAllListeners("job_events-" + job_id);
-            //    });
             }
             if ($state.current.name === 'adHocJobStdout') {
                 $log.debug("socket watching on ad_hoc_command_events-" + job_id);
@@ -42,11 +37,6 @@ export default ['$log', '$rootScope', '$scope', '$state', '$stateParams', 'Proce
                         event_queue++;
                     }
                 });
-                // Unbind $rootScope socket event binding(s) so that they don't get triggered
-                // in another instance of this controller
-                // $scope.$on('$destroy', function() {
-                //     $rootScope.adhoc_event_socket.removeAllListeners("ad_hoc_command_events-" + job_id);
-                // });
             }
         }