Merge pull request #2538 from mattermost/websocket-fix

Fix websocket trying to reconnect after a logout

2 files changed, 13 insertions, 7 deletions

diff --git a/webapp/action_creators/websocket_actions.jsx b/webapp/action_creators/websocket_actions.jsx
index 93b12692a..bb46db149 100644
--- a/webapp/action_creators/websocket_actions.jsx
+++ b/webapp/action_creators/websocket_actions.jsx
@@ -22,6 +22,7 @@ const WEBSOCKET_RETRY_TIME = 3000;
 var conn = null;
 var connectFailCount = 0;
 var pastFirstInit = false;
+var manuallyClosed = false;
 
 export function initialize() {
     if (window.WebSocket && !conn) {
@@ -36,6 +37,8 @@ export function initialize() {
             console.log('websocket connecting to ' + connUrl); //eslint-disable-line no-console
         }
 
+        manuallyClosed = false;
+
         conn = new WebSocket(connUrl);
 
         conn.onopen = () => {
@@ -70,12 +73,14 @@ export function initialize() {
             ErrorStore.setConnectionErrorCount(connectFailCount);
             ErrorStore.emitChange();
 
-            setTimeout(
-                () => {
-                    initialize();
-                },
-                WEBSOCKET_RETRY_TIME
-            );
+            if (!manuallyClosed) {
+                setTimeout(
+                    () => {
+                        initialize();
+                    },
+                    WEBSOCKET_RETRY_TIME
+                );
+            }
         };
 
         conn.onerror = (evt) => {
@@ -148,6 +153,7 @@ export function sendMessage(msg) {
 }
 
 export function close() {
+    manuallyClosed = true;
     if (conn && conn.readyState === WebSocket.OPEN) {
         conn.close();
     }
diff --git a/webapp/components/signup_team_complete/components/signup_team_complete.jsx b/webapp/components/signup_team_complete/components/signup_team_complete.jsx
index 8b2096499..d21f4d7a9 100644
--- a/webapp/components/signup_team_complete/components/signup_team_complete.jsx
+++ b/webapp/components/signup_team_complete/components/signup_team_complete.jsx
@@ -55,7 +55,7 @@ export default class SignupTeamComplete extends React.Component {
             <div>
                 <div className='signup-header'>
                     <Link to='/'>
-                        <span classNameName='fa fa-chevron-left'/>
+                        <span className='fa fa-chevron-left'/>
                         <FormattedMessage id='web.header.back'/>
                     </Link>
                 </div>