diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-03-28 07:54:57 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-03-28 07:54:57 -0400 |
commit | 1db912df8dc29ac06298b886ab5d58b66fe181f1 (patch) | |
tree | 092e39de3b499c87bf382bf0fee82f53960d16df /webapp | |
parent | 8362d3ac0b3e59fa7747544f3ed21be3a1bd26fd (diff) | |
parent | 6516e9bf6801f7c9ec247b2397503a834c93d790 (diff) | |
download | chat-1db912df8dc29ac06298b886ab5d58b66fe181f1.tar.gz chat-1db912df8dc29ac06298b886ab5d58b66fe181f1.tar.bz2 chat-1db912df8dc29ac06298b886ab5d58b66fe181f1.zip |
Merge pull request #2538 from mattermost/websocket-fix
Fix websocket trying to reconnect after a logout
Diffstat (limited to 'webapp')
-rw-r--r-- | webapp/action_creators/websocket_actions.jsx | 18 | ||||
-rw-r--r-- | webapp/components/signup_team_complete/components/signup_team_complete.jsx | 2 |
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> |