diff options
| author | Corey Hulen <corey@hulen.com> | 2017-09-05 07:58:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-05 07:58:47 -0700 |
| commit | d6383643cb9f60e0429d09c1d363b7781da15e47 (patch) | |
| tree | 57c2cebd71930e0efa2be4c74ea24715871fa02d /app/websocket_router.go | |
| parent | 7843dc3cfa7e99db5b6c89698ef09dbc7b6138ea (diff) | |
| download | chat-d6383643cb9f60e0429d09c1d363b7781da15e47.tar.gz chat-d6383643cb9f60e0429d09c1d363b7781da15e47.tar.bz2 chat-d6383643cb9f60e0429d09c1d363b7781da15e47.zip | |
PLT-6226 fixing race in IsAuth (#7296)
* Fixing race in isAuth function
* PLT-6226 fixing race in IsAuth
* Moving int64 to top so it's aligned
* Adding comment and fixing asymmetric call
Diffstat (limited to 'app/websocket_router.go')
| -rw-r--r-- | app/websocket_router.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/websocket_router.go b/app/websocket_router.go index e8957e6b5..a3c56454f 100644 --- a/app/websocket_router.go +++ b/app/websocket_router.go @@ -43,7 +43,7 @@ func (wr *WebSocketRouter) ServeWebSocket(conn *WebConn, r *model.WebSocketReque } if r.Action == model.WEBSOCKET_AUTHENTICATION_CHALLENGE { - if conn.SessionToken != "" { + if conn.GetSessionToken() != "" { return } @@ -63,7 +63,8 @@ func (wr *WebSocketRouter) ServeWebSocket(conn *WebConn, r *model.WebSocketReque UpdateLastActivityAtIfNeeded(*session) }() - conn.SessionToken = session.Token + conn.SetSession(session) + conn.SetSessionToken(session.Token) conn.UserId = session.UserId HubRegister(conn) |