diff options
Diffstat (limited to 'app/elasticsearch.go')
| -rw-r--r-- | app/elasticsearch.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/elasticsearch.go b/app/elasticsearch.go index 71fe6cedb..c3b558bce 100644 --- a/app/elasticsearch.go +++ b/app/elasticsearch.go @@ -7,13 +7,12 @@ import ( "net/http" "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" ) func (a *App) 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.ConnectionUrl == *a.Config().ElasticsearchSettings.ConnectionUrl && *cfg.ElasticsearchSettings.Username == *a.Config().ElasticsearchSettings.Username { + *cfg.ElasticsearchSettings.Password = *a.Config().ElasticsearchSettings.Password } else { return model.NewAppError("TestElasticsearch", "ent.elasticsearch.test_config.reenter_password", nil, "", http.StatusBadRequest) } |