remove remaining Global() calls (outside of tests) (#7521)

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 {

cmd/platform/test.go

@@ -52,10 +52,10 @@ func webClientTestsCmdF(cmd *cobra.Command, args []string) error {
 
 	utils.InitTranslations(utils.Cfg.LocalizationSettings)
 	a.Srv.Router = api.NewRouter()
-	wsapi.InitRouter()
+	a.Srv.WebSocketRouter = a.NewWebSocketRouter()
 	api4.Init(a, a.Srv.Router, false)
 	api.Init(a, a.Srv.Router)
-	wsapi.InitApi()
+	wsapi.Init(a, a.Srv.WebSocketRouter)
 	setupClientTests()
 	a.StartServer()
 	runWebClientTests()
@@ -72,10 +72,10 @@ func serverForWebClientTestsCmdF(cmd *cobra.Command, args []string) error {
 
 	utils.InitTranslations(utils.Cfg.LocalizationSettings)
 	a.Srv.Router = api.NewRouter()
-	wsapi.InitRouter()
+	a.Srv.WebSocketRouter = a.NewWebSocketRouter()
 	api4.Init(a, a.Srv.Router, false)
 	api.Init(a, a.Srv.Router)
-	wsapi.InitApi()
+	wsapi.Init(a, a.Srv.WebSocketRouter)
 	setupClientTests()
 	a.StartServer()