From 185ed89978e0d88d75b5c606104e78058753bd4d Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Thu, 26 Jul 2018 15:50:38 +0100 Subject: MM-11243: Make Elasticsearch work after enabling without restart. (#9146) * MM-11243: Make Elasticsearch work after enabling without restart. * Also cope with config vars changing whilst enabled. --- cmd/mattermost/commands/server.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'cmd') diff --git a/cmd/mattermost/commands/server.go b/cmd/mattermost/commands/server.go index 1fab5c83a..1c33505f5 100644 --- a/cmd/mattermost/commands/server.go +++ b/cmd/mattermost/commands/server.go @@ -176,11 +176,7 @@ func runServer(configFileLocation string, disableConfigWatch bool, usedPlatform } if a.Elasticsearch != nil { - a.Go(func() { - if err := a.Elasticsearch.Start(); err != nil { - mlog.Error(err.Error()) - } - }) + a.StartElasticsearch() } if *a.Config().JobSettings.RunJobs { -- cgit v1.2.3-1-g7c22