diff options
| author | Chris <ccbrown112@gmail.com> | 2017-09-22 12:54:27 -0500 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-09-22 13:54:27 -0400 |
| commit | dcf9e96a0b16530549168a7891ed8242663b5f28 (patch) | |
| tree | 344255f0abbe1bd207e2f2ab864d245e240f4eeb /cmd | |
| parent | e0d5703f721aafef1b55747cd09629860e86bfb4 (diff) | |
| download | chat-dcf9e96a0b16530549168a7891ed8242663b5f28.tar.gz chat-dcf9e96a0b16530549168a7891ed8242663b5f28.tar.bz2 chat-dcf9e96a0b16530549168a7891ed8242663b5f28.zip | |
remove global refs from api/api4 (#7496)
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/platform/server.go | 8 | ||||
| -rw-r--r-- | cmd/platform/test.go | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/cmd/platform/server.go b/cmd/platform/server.go index 60d3804e4..55854dfe4 100644 --- a/cmd/platform/server.go +++ b/cmd/platform/server.go @@ -81,10 +81,10 @@ func runServer(configFileLocation string) { } wsapi.InitRouter() - api4.InitApi(a.Srv.Router, false) - api.InitApi(a.Srv.Router) + api4.Init(a, a.Srv.Router, false) + api3 := api.Init(a, a.Srv.Router) wsapi.InitApi() - web.InitWeb() + web.Init(api3) if !utils.IsLicensed() && len(utils.Cfg.SqlSettings.DataSourceReplicas) > 1 { l4g.Warn(utils.T("store.sql.read_replicas_not_licensed.critical")) @@ -108,7 +108,7 @@ func runServer(configFileLocation string) { // If we allow testing then listen for manual testing URL hits if utils.Cfg.ServiceSettings.EnableTesting { - manualtesting.InitManualTesting() + manualtesting.Init(api3) } setDiagnosticId(a) diff --git a/cmd/platform/test.go b/cmd/platform/test.go index a7b89f40f..fd8777a46 100644 --- a/cmd/platform/test.go +++ b/cmd/platform/test.go @@ -53,8 +53,8 @@ func webClientTestsCmdF(cmd *cobra.Command, args []string) error { utils.InitTranslations(utils.Cfg.LocalizationSettings) a.Srv.Router = api.NewRouter() wsapi.InitRouter() - api4.InitApi(a.Srv.Router, false) - api.InitApi(a.Srv.Router) + api4.Init(a, a.Srv.Router, false) + api.Init(a, a.Srv.Router) wsapi.InitApi() setupClientTests() a.StartServer() @@ -73,8 +73,8 @@ func serverForWebClientTestsCmdF(cmd *cobra.Command, args []string) error { utils.InitTranslations(utils.Cfg.LocalizationSettings) a.Srv.Router = api.NewRouter() wsapi.InitRouter() - api4.InitApi(a.Srv.Router, false) - api.InitApi(a.Srv.Router) + api4.Init(a, a.Srv.Router, false) + api.Init(a, a.Srv.Router) wsapi.InitApi() setupClientTests() a.StartServer() |