From ac74066f0e4f3d62f2d4645c3fa34b88c13958d1 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 19 Sep 2017 18:31:35 -0500 Subject: remove einterface gets (#7455) --- app/elasticsearch.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'app/elasticsearch.go') diff --git a/app/elasticsearch.go b/app/elasticsearch.go index 96e271272..71fe6cedb 100644 --- a/app/elasticsearch.go +++ b/app/elasticsearch.go @@ -6,12 +6,11 @@ package app import ( "net/http" - "github.com/mattermost/mattermost-server/einterfaces" "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/utils" ) -func TestElasticsearch(cfg *model.Config) *model.AppError { +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 @@ -20,7 +19,7 @@ func TestElasticsearch(cfg *model.Config) *model.AppError { } } - if esI := einterfaces.GetElasticsearchInterface(); esI != nil { + if esI := a.Elasticsearch; esI != nil { if err := esI.TestConfig(cfg); err != nil { return err } @@ -32,8 +31,8 @@ func TestElasticsearch(cfg *model.Config) *model.AppError { return nil } -func PurgeElasticsearchIndexes() *model.AppError { - if esI := einterfaces.GetElasticsearchInterface(); esI != nil { +func (a *App) PurgeElasticsearchIndexes() *model.AppError { + if esI := a.Elasticsearch; esI != nil { if err := esI.PurgeIndexes(); err != nil { return err } -- cgit v1.2.3-1-g7c22