From 8c80cdde38cceb3424b2b1f43eadf7a1aab0c6df Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 27 Sep 2017 11:52:34 -0500 Subject: remove remaining Global() calls (outside of tests) (#7521) --- wsapi/api.go | 22 ++++++++++++++-------- wsapi/status.go | 10 +++++----- wsapi/system.go | 5 ++--- wsapi/user.go | 9 ++++----- wsapi/webrtc.go | 9 ++++----- wsapi/websocket_handler.go | 7 ++++--- 6 files changed, 33 insertions(+), 29 deletions(-) (limited to 'wsapi') diff --git a/wsapi/api.go b/wsapi/api.go index 4de0f265f..f318cba6f 100644 --- a/wsapi/api.go +++ b/wsapi/api.go @@ -7,15 +7,21 @@ import ( "github.com/mattermost/mattermost-server/app" ) -func InitRouter() { - app.Global().Srv.WebSocketRouter = app.NewWebSocketRouter() +type API struct { + App *app.App + Router *app.WebSocketRouter } -func InitApi() { - InitUser() - InitSystem() - InitStatus() - InitWebrtc() +func Init(a *app.App, router *app.WebSocketRouter) { + api := &API{ + App: a, + Router: router, + } - app.HubStart() + api.InitUser() + api.InitSystem() + api.InitStatus() + api.InitWebrtc() + + a.HubStart() } diff --git a/wsapi/status.go b/wsapi/status.go index a60900feb..a20b6e284 100644 --- a/wsapi/status.go +++ b/wsapi/status.go @@ -10,11 +10,11 @@ import ( "github.com/mattermost/mattermost-server/utils" ) -func InitStatus() { +func (api *API) InitStatus() { l4g.Debug(utils.T("wsapi.status.init.debug")) - app.Global().Srv.WebSocketRouter.Handle("get_statuses", ApiWebSocketHandler(getStatuses)) - app.Global().Srv.WebSocketRouter.Handle("get_statuses_by_ids", ApiWebSocketHandler(getStatusesByIds)) + api.Router.Handle("get_statuses", api.ApiWebSocketHandler(getStatuses)) + api.Router.Handle("get_statuses_by_ids", api.ApiWebSocketHandler(api.getStatusesByIds)) } func getStatuses(req *model.WebSocketRequest) (map[string]interface{}, *model.AppError) { @@ -22,14 +22,14 @@ func getStatuses(req *model.WebSocketRequest) (map[string]interface{}, *model.Ap return model.StatusMapToInterfaceMap(statusMap), nil } -func getStatusesByIds(req *model.WebSocketRequest) (map[string]interface{}, *model.AppError) { +func (api *API) getStatusesByIds(req *model.WebSocketRequest) (map[string]interface{}, *model.AppError) { var userIds []string if userIds = model.ArrayFromInterface(req.Data["user_ids"]); len(userIds) == 0 { l4g.Error(model.StringInterfaceToJson(req.Data)) return nil, NewInvalidWebSocketParamError(req.Action, "user_ids") } - statusMap, err := app.Global().GetStatusesByIds(userIds) + statusMap, err := api.App.GetStatusesByIds(userIds) if err != nil { return nil, err } diff --git a/wsapi/system.go b/wsapi/system.go index e019e79b2..6959106d6 100644 --- a/wsapi/system.go +++ b/wsapi/system.go @@ -5,15 +5,14 @@ package wsapi import ( l4g "github.com/alecthomas/log4go" - "github.com/mattermost/mattermost-server/app" "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/utils" ) -func InitSystem() { +func (api *API) InitSystem() { l4g.Debug(utils.T("wsapi.system.init.debug")) - app.Global().Srv.WebSocketRouter.Handle("ping", ApiWebSocketHandler(ping)) + api.Router.Handle("ping", api.ApiWebSocketHandler(ping)) } func ping(req *model.WebSocketRequest) (map[string]interface{}, *model.AppError) { diff --git a/wsapi/user.go b/wsapi/user.go index d79ecab83..c8236c978 100644 --- a/wsapi/user.go +++ b/wsapi/user.go @@ -5,18 +5,17 @@ package wsapi import ( l4g "github.com/alecthomas/log4go" - "github.com/mattermost/mattermost-server/app" "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/utils" ) -func InitUser() { +func (api *API) InitUser() { l4g.Debug(utils.T("wsapi.user.init.debug")) - app.Global().Srv.WebSocketRouter.Handle("user_typing", ApiWebSocketHandler(userTyping)) + api.Router.Handle("user_typing", api.ApiWebSocketHandler(api.userTyping)) } -func userTyping(req *model.WebSocketRequest) (map[string]interface{}, *model.AppError) { +func (api *API) userTyping(req *model.WebSocketRequest) (map[string]interface{}, *model.AppError) { var ok bool var channelId string if channelId, ok = req.Data["channel_id"].(string); !ok || len(channelId) != 26 { @@ -34,7 +33,7 @@ func userTyping(req *model.WebSocketRequest) (map[string]interface{}, *model.App event := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_TYPING, "", channelId, "", omitUsers) event.Add("parent_id", parentId) event.Add("user_id", req.Session.UserId) - go app.Publish(event) + go api.App.Publish(event) return nil, nil } diff --git a/wsapi/webrtc.go b/wsapi/webrtc.go index a2e1a18ce..42e749ebb 100644 --- a/wsapi/webrtc.go +++ b/wsapi/webrtc.go @@ -5,18 +5,17 @@ package wsapi import ( l4g "github.com/alecthomas/log4go" - "github.com/mattermost/mattermost-server/app" "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/utils" ) -func InitWebrtc() { +func (api *API) InitWebrtc() { l4g.Debug(utils.T("wsapi.webtrc.init.debug")) - app.Global().Srv.WebSocketRouter.Handle("webrtc", ApiWebSocketHandler(webrtcMessage)) + api.Router.Handle("webrtc", api.ApiWebSocketHandler(api.webrtcMessage)) } -func webrtcMessage(req *model.WebSocketRequest) (map[string]interface{}, *model.AppError) { +func (api *API) webrtcMessage(req *model.WebSocketRequest) (map[string]interface{}, *model.AppError) { var ok bool var toUserId string if toUserId, ok = req.Data["to_user_id"].(string); !ok || len(toUserId) != 26 { @@ -25,7 +24,7 @@ func webrtcMessage(req *model.WebSocketRequest) (map[string]interface{}, *model. event := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_WEBRTC, "", "", toUserId, nil) event.Data = req.Data - go app.Publish(event) + go api.App.Publish(event) return nil, nil } 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 = "" -- cgit v1.2.3-1-g7c22