diff options
| author | George Goldberg <george@gberg.me> | 2018-07-26 15:50:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-26 15:50:38 +0100 |
| commit | 185ed89978e0d88d75b5c606104e78058753bd4d (patch) | |
| tree | f7950dbbc6f429618f7bb0aa45ccdf613b8afc19 /cmd | |
| parent | 8948b91d7a80169b12907e16581cfdd53bbb73f1 (diff) | |
| download | chat-185ed89978e0d88d75b5c606104e78058753bd4d.tar.gz chat-185ed89978e0d88d75b5c606104e78058753bd4d.tar.bz2 chat-185ed89978e0d88d75b5c606104e78058753bd4d.zip | |
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.
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/mattermost/commands/server.go | 6 |
1 files changed, 1 insertions, 5 deletions
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 { |