diff options
| author | George Goldberg <george@gberg.me> | 2017-07-07 17:12:14 +0100 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-07-07 12:12:14 -0400 |
| commit | 39b071bc0e620b24a9dc8b13fcd6ccf5f6732ea5 (patch) | |
| tree | 6bc32b749d4aeffdb349297055a9b54411e2bf9c /app/elasticsearch.go | |
| parent | db2f6cf0766543b6d9e9fb4ecd10947ce60b46b9 (diff) | |
| download | chat-39b071bc0e620b24a9dc8b13fcd6ccf5f6732ea5.tar.gz chat-39b071bc0e620b24a9dc8b13fcd6ccf5f6732ea5.tar.bz2 chat-39b071bc0e620b24a9dc8b13fcd6ccf5f6732ea5.zip | |
Add optional config parameter to test elasticsearch endpoint. (#6877)
Diffstat (limited to 'app/elasticsearch.go')
| -rw-r--r-- | app/elasticsearch.go | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/app/elasticsearch.go b/app/elasticsearch.go index 87687ddcc..ef34a6074 100644 --- a/app/elasticsearch.go +++ b/app/elasticsearch.go @@ -8,11 +8,20 @@ import ( "github.com/mattermost/platform/model" "github.com/mattermost/platform/einterfaces" + "github.com/mattermost/platform/utils" ) -func TestElasticsearch() *model.AppError { +func TestElasticsearch(cfg *model.Config) *model.AppError { + if *cfg.ElasticSearchSettings.Password == model.FAKE_SETTING { + if *cfg.ElasticSearchSettings.ConnectionUrl == *utils.Cfg.ElasticSearchSettings.ConnectionUrl && *cfg.ElasticSearchSettings.Username == *utils.Cfg.ElasticSearchSettings.Username { + *cfg.ElasticSearchSettings.Password = *utils.Cfg.ElasticSearchSettings.Password + } else { + return model.NewAppError("TestElasticsearch", "ent.elasticsearch.test_config.reenter_password", nil, "", http.StatusBadRequest) + } + } + if esI := einterfaces.GetElasticsearchInterface(); esI != nil { - if err := esI.TestConfig(); err != nil { + if err := esI.TestConfig(cfg); err != nil { return err } } else { |