diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-10-23 08:38:15 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-10-23 08:38:15 -0700 |
| commit | 028657b43ed7d6e2b0adca322e2d47781c1b3eb4 (patch) | |
| tree | 7366462741ae8f980f8066d1daa8166ae8a3c17b /web/react/stores/socket_store.jsx | |
| parent | 009982cd4514c6f0950138b15367df559c8f4dd2 (diff) | |
| parent | 0cf24be0662fb9ee2a3b52bfb8c3903bc8c32b72 (diff) | |
| download | chat-028657b43ed7d6e2b0adca322e2d47781c1b3eb4.tar.gz chat-028657b43ed7d6e2b0adca322e2d47781c1b3eb4.tar.bz2 chat-028657b43ed7d6e2b0adca322e2d47781c1b3eb4.zip | |
Merge branch 'master' into PLT-25
Diffstat (limited to 'web/react/stores/socket_store.jsx')
| -rw-r--r-- | web/react/stores/socket_store.jsx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/web/react/stores/socket_store.jsx b/web/react/stores/socket_store.jsx index 77951f214..8c3489001 100644 --- a/web/react/stores/socket_store.jsx +++ b/web/react/stores/socket_store.jsx @@ -38,6 +38,10 @@ class SocketStoreClass extends EventEmitter { return; } + if (!global.window.hasOwnProperty('mm_session_token_index')) { + return; + } + this.setMaxListeners(0); if (window.WebSocket && !conn) { @@ -45,7 +49,9 @@ class SocketStoreClass extends EventEmitter { if (window.location.protocol === 'https:') { protocol = 'wss://'; } - var connUrl = protocol + location.host + '/api/v1/websocket'; + + var connUrl = protocol + location.host + '/api/v1/websocket?' + Utils.getSessionIndex(); + if (this.failCount === 0) { console.log('websocket connecting to ' + connUrl); //eslint-disable-line no-console } |