Initialize and close WebSocket more accurately and consistently (#3683)

1 files changed, 3 insertions, 8 deletions

diff --git a/webapp/client/websocket_client.jsx b/webapp/client/websocket_client.jsx
index 99d2311b7..aa78d8d98 100644
--- a/webapp/client/websocket_client.jsx
+++ b/webapp/client/websocket_client.jsx
@@ -10,7 +10,6 @@ export default class WebSocketClient {
         this.conn = null;
         this.sequence = 1;
         this.connectFailCount = 0;
-        this.manuallyClosed = false;
         this.eventCallback = null;
         this.responseCallbacks = {};
         this.reconnectCallback = null;
@@ -27,8 +26,6 @@ export default class WebSocketClient {
             console.log('websocket connecting to ' + connectionUrl); //eslint-disable-line no-console
         }
 
-        this.manuallyClosed = false;
-
         this.conn = new WebSocket(connectionUrl);
 
         this.conn.onopen = () => {
@@ -51,10 +48,6 @@ export default class WebSocketClient {
                 console.log('websocket closed'); //eslint-disable-line no-console
             }
 
-            if (this.manuallyClosed) {
-                return;
-            }
-
             this.connectFailCount++;
 
             if (this.closeCallback) {
@@ -124,11 +117,13 @@ export default class WebSocketClient {
     }
 
     close() {
-        this.manuallyClosed = true;
         this.connectFailCount = 0;
         this.sequence = 1;
         if (this.conn && this.conn.readyState === WebSocket.OPEN) {
+            this.conn.onclose = () => {}; //eslint-disable-line no-empty-function
             this.conn.close();
+            this.conn = null;
+            console.log('websocket closed'); //eslint-disable-line no-console
         }
     }