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/api.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/api.go')
-rw-r--r-- | wsapi/api.go | 22 |
1 files changed, 14 insertions, 8 deletions
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() } |