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 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'wsapi/api.go') 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() } -- cgit v1.2.3-1-g7c22