From 8e19ba029f889519d93cf272960dce858971106c Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 18 Oct 2017 15:36:43 -0700 Subject: Reduce utils.Cfg references (#7650) * app.UpdateConfig method * test fix * another test fix * the config override option as-was is just error prone, remove it for now * derp --- app/analytics.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'app/analytics.go') diff --git a/app/analytics.go b/app/analytics.go index 65a9e4129..5d30ad426 100644 --- a/app/analytics.go +++ b/app/analytics.go @@ -7,7 +7,6 @@ import ( l4g "github.com/alecthomas/log4go" "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/utils" ) const ( @@ -22,8 +21,8 @@ func (a *App) GetAnalytics(name string, teamId string) (model.AnalyticsRows, *mo return nil, r.Err } else { systemUserCount = r.Data.(int64) - if systemUserCount > int64(*utils.Cfg.AnalyticsSettings.MaxUsersForStatistics) { - l4g.Debug("More than %v users on the system, intensive queries skipped", *utils.Cfg.AnalyticsSettings.MaxUsersForStatistics) + if systemUserCount > int64(*a.Config().AnalyticsSettings.MaxUsersForStatistics) { + l4g.Debug("More than %v users on the system, intensive queries skipped", *a.Config().AnalyticsSettings.MaxUsersForStatistics) skipIntensiveQueries = true } } @@ -97,7 +96,7 @@ func (a *App) GetAnalytics(name string, teamId string) (model.AnalyticsRows, *mo } // If in HA mode then aggregrate all the stats - if a.Cluster != nil && *utils.Cfg.ClusterSettings.Enable { + if a.Cluster != nil && *a.Config().ClusterSettings.Enable { stats, err := a.Cluster.GetClusterStats() if err != nil { return nil, err -- cgit v1.2.3-1-g7c22