From c0c47df3f0d49eeb0fbab4aea1d587bfb3aebebb Mon Sep 17 00:00:00 2001 From: Claudio Costa Date: Fri, 8 Nov 2019 20:37:15 +0100 Subject: [PATCH] Fix data race on server startup (#13006) --- cmd/mattermost/commands/server.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/mattermost/commands/server.go b/cmd/mattermost/commands/server.go index d8553e3167..9813f387c7 100644 --- a/cmd/mattermost/commands/server.go +++ b/cmd/mattermost/commands/server.go @@ -72,16 +72,16 @@ func runServer(configStore config.Store, disableConfigWatch bool, usedPlatform b mlog.Error("The platform binary has been deprecated, please switch to using the mattermost binary.") } + api := api4.Init(server, server.AppOptions, server.Router) + wsapi.Init(server.FakeApp(), server.WebSocketRouter) + web.New(server, server.AppOptions, server.Router) + serverErr := server.Start() if serverErr != nil { mlog.Critical(serverErr.Error()) return serverErr } - api := api4.Init(server, server.AppOptions, server.Router) - wsapi.Init(server.FakeApp(), server.WebSocketRouter) - web.New(server, server.AppOptions, server.Router) - // If we allow testing then listen for manual testing URL hits if *server.Config().ServiceSettings.EnableTesting { manualtesting.Init(api)