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 /cmd/platform/server.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 'cmd/platform/server.go')
-rw-r--r-- | cmd/platform/server.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/platform/server.go b/cmd/platform/server.go index 55854dfe4..7f5fbf6e8 100644 --- a/cmd/platform/server.go +++ b/cmd/platform/server.go @@ -69,6 +69,7 @@ func runServer(configFileLocation string) { a.NewServer() a.InitStores() a.Srv.Router = api.NewRouter() + a.Srv.WebSocketRouter = a.NewWebSocketRouter() if model.BuildEnterpriseReady == "true" { a.LoadLicense() @@ -80,10 +81,9 @@ func runServer(configFileLocation string) { l4g.Error("Unable to find webapp directory, could not initialize plugins") } - wsapi.InitRouter() api4.Init(a, a.Srv.Router, false) api3 := api.Init(a, a.Srv.Router) - wsapi.InitApi() + wsapi.Init(a, a.Srv.WebSocketRouter) web.Init(api3) if !utils.IsLicensed() && len(utils.Cfg.SqlSettings.DataSourceReplicas) > 1 { |