diff options
author | Chris <ccbrown112@gmail.com> | 2017-09-27 11:52:34 -0500 |
---|---|---|
committer | Saturnino Abril <saturnino.abril@gmail.com> | 2017-09-28 00:52:34 +0800 |
commit | 8c80cdde38cceb3424b2b1f43eadf7a1aab0c6df (patch) | |
tree | b3563dfe35ad78991774c9d1842dc439376e1db1 /app/websocket_router.go | |
parent | 1bd66589a2adc67df5df9c108a2f2ecc77dfdf44 (diff) | |
download | chat-8c80cdde38cceb3424b2b1f43eadf7a1aab0c6df.tar.gz chat-8c80cdde38cceb3424b2b1f43eadf7a1aab0c6df.tar.bz2 chat-8c80cdde38cceb3424b2b1f43eadf7a1aab0c6df.zip |
remove remaining Global() calls (outside of tests) (#7521)
Diffstat (limited to 'app/websocket_router.go')
-rw-r--r-- | app/websocket_router.go | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/app/websocket_router.go b/app/websocket_router.go index bfb649d6c..c8220f1f1 100644 --- a/app/websocket_router.go +++ b/app/websocket_router.go @@ -17,13 +17,15 @@ type webSocketHandler interface { } type WebSocketRouter struct { + app *App handlers map[string]webSocketHandler } -func NewWebSocketRouter() *WebSocketRouter { - router := &WebSocketRouter{} - router.handlers = make(map[string]webSocketHandler) - return router +func (a *App) NewWebSocketRouter() *WebSocketRouter { + return &WebSocketRouter{ + app: a, + handlers: make(map[string]webSocketHandler), + } } func (wr *WebSocketRouter) Handle(action string, handler webSocketHandler) { @@ -54,21 +56,21 @@ func (wr *WebSocketRouter) ServeWebSocket(conn *WebConn, r *model.WebSocketReque return } - session, err := Global().GetSession(token) + session, err := wr.app.GetSession(token) if err != nil { conn.WebSocket.Close() } else { go func() { - Global().SetStatusOnline(session.UserId, session.Id, false) - Global().UpdateLastActivityAtIfNeeded(*session) + wr.app.SetStatusOnline(session.UserId, session.Id, false) + wr.app.UpdateLastActivityAtIfNeeded(*session) }() conn.SetSession(session) conn.SetSessionToken(session.Token) conn.UserId = session.UserId - HubRegister(conn) + wr.app.HubRegister(conn) resp := model.NewWebSocketResponse(model.STATUS_OK, r.Seq, nil) conn.Send <- resp |