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 /wsapi/websocket_handler.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 'wsapi/websocket_handler.go')
| -rw-r--r-- | wsapi/websocket_handler.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/wsapi/websocket_handler.go b/wsapi/websocket_handler.go index 5dfa5bdb0..daf225061 100644 --- a/wsapi/websocket_handler.go +++ b/wsapi/websocket_handler.go @@ -13,18 +13,19 @@ import ( "github.com/mattermost/mattermost-server/utils" ) -func ApiWebSocketHandler(wh func(*model.WebSocketRequest) (map[string]interface{}, *model.AppError)) webSocketHandler { - return webSocketHandler{wh} +func (api *API) ApiWebSocketHandler(wh func(*model.WebSocketRequest) (map[string]interface{}, *model.AppError)) webSocketHandler { + return webSocketHandler{api.App, wh} } type webSocketHandler struct { + app *app.App handlerFunc func(*model.WebSocketRequest) (map[string]interface{}, *model.AppError) } func (wh webSocketHandler) ServeWebSocket(conn *app.WebConn, r *model.WebSocketRequest) { l4g.Debug("/api/v3/users/websocket:%s", r.Action) - session, sessionErr := app.Global().GetSession(conn.GetSessionToken()) + session, sessionErr := wh.app.GetSession(conn.GetSessionToken()) if sessionErr != nil { l4g.Error(utils.T("api.web_socket_handler.log.error"), "/api/v3/users/websocket", r.Action, r.Seq, conn.UserId, sessionErr.SystemMessage(utils.T), sessionErr.Error()) sessionErr.DetailedError = "" |