IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

MM-11243: Make Elasticsearch work after enabling without restart. (#9146)

Browse Source 
* MM-11243: Make Elasticsearch work after enabling without restart.

* Also cope with config vars changing whilst enabled.
This commit is contained in:
George Goldberg
2018-07-26 15:50:38 +01:00
committed by GitHub
parent 8948b91d7a
commit 185ed89978
4 changed files with 61 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
app/app.go
View File

@@ -680,3 +680,54 @@ func (a *App) DoEmojisPermissionsMigration() {
mlog.Critical(fmt.Sprint(result.Err))
}
}
func (a *App) StartElasticsearch() {
a.Go(func() {
if err := a.Elasticsearch.Start(); err != nil {
mlog.Error(err.Error())
}
})
a.AddConfigListener(func(oldConfig *model.Config, newConfig *model.Config) {
if *oldConfig.ElasticsearchSettings.EnableIndexing == false && *newConfig.ElasticsearchSettings.EnableIndexing == true {
a.Go(func() {
if err := a.Elasticsearch.Start(); err != nil {
mlog.Error(err.Error())
}
})
} else if *oldConfig.ElasticsearchSettings.EnableIndexing == true && *newConfig.ElasticsearchSettings.EnableIndexing == false {
a.Go(func() {
if err := a.Elasticsearch.Stop(); err != nil {
mlog.Error(err.Error())
}
})
} else if *oldConfig.ElasticsearchSettings.Password != *newConfig.ElasticsearchSettings.Password || *oldConfig.ElasticsearchSettings.Username != *newConfig.ElasticsearchSettings.Username || *oldConfig.ElasticsearchSettings.ConnectionUrl != *newConfig.ElasticsearchSettings.ConnectionUrl || *oldConfig.ElasticsearchSettings.Sniff != *newConfig.ElasticsearchSettings.Sniff {
a.Go(func() {
if *oldConfig.ElasticsearchSettings.EnableIndexing == true {
if err := a.Elasticsearch.Stop(); err != nil {
mlog.Error(err.Error())
}
if err := a.Elasticsearch.Start(); err != nil {
mlog.Error(err.Error())
}
}
})
}
})
a.AddLicenseListener(func() {
if a.License() != nil {
a.Go(func() {
if err := a.Elasticsearch.Start(); err != nil {
mlog.Error(err.Error())
}
})
} else {
a.Go(func() {
if err := a.Elasticsearch.Stop(); err != nil {
mlog.Error(err.Error())
}
})
}
})
}

6
cmd/mattermost/commands/server.go
View File

@@ -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 {

1
einterfaces/elasticsearch.go
View File

@@ -11,6 +11,7 @@ import (
type ElasticsearchInterface interface {
Start() *model.AppError
Stop() *model.AppError
IndexPost(post *model.Post, teamId string) *model.AppError
SearchPosts(channels *model.ChannelList, searchParams []*model.SearchParams) ([]string, model.PostSearchMatches, *model.AppError)
DeletePost(post *model.Post) *model.AppError

8
i18n/en.json
View File

@@ -167,6 +167,14 @@
"id": "api.channel.join_channel.already_deleted.app_error",
"translation": "Channel is already deleted"
},
{
"id": "ent.elasticsearch.start.already_started.app_error",
"translation": "Elasticsearch is already started"
},
{
"id": "ent.elasticsearch.stop.already_stopped.app_error",
"translation": "Elasticsearch is already stopped"
},
{
"id": "api.channel.join_channel.permissions.app_error",
"translation": "You do not have the appropriate permissions"