IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove remaining Global() calls (outside of tests) (#7521)

Browse Source
This commit is contained in:
Chris
2017-09-27 11:52:34 -05:00
committed by Saturnino Abril
parent 1bd66589a2
commit 8c80cdde38
45 changed files with 207 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wsapi/websocket_handler.go
View File

@@ -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 = ""