From dcf9e96a0b16530549168a7891ed8242663b5f28 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 22 Sep 2017 12:54:27 -0500 Subject: remove global refs from api/api4 (#7496) --- cmd/platform/server.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cmd/platform/server.go') 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) -- cgit v1.2.3-1-g7c22