diff options
| author | George Goldberg <george@gberg.me> | 2017-07-27 08:48:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-27 08:48:02 +0100 |
| commit | ff0a7905166e29ecf9404fa90d23af7863885384 (patch) | |
| tree | edb8f060e2e083cdb55ed4c0d464ac44b7112242 /app/elasticsearch.go | |
| parent | 244b15ea5b7039ecca1614140cbcf62ba3379184 (diff) | |
| download | chat-ff0a7905166e29ecf9404fa90d23af7863885384.tar.gz chat-ff0a7905166e29ecf9404fa90d23af7863885384.tar.bz2 chat-ff0a7905166e29ecf9404fa90d23af7863885384.zip | |
PLT-7040: Fix capitalisation of Elasticsearch in Config. (#7020)
Diffstat (limited to 'app/elasticsearch.go')
| -rw-r--r-- | app/elasticsearch.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/elasticsearch.go b/app/elasticsearch.go index 857ed570a..740042ba5 100644 --- a/app/elasticsearch.go +++ b/app/elasticsearch.go @@ -12,9 +12,9 @@ import ( ) 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 + 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) } |