From 10c5a927cb619f1aa2a599cbe3667820f4766bda Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 9 Nov 2017 14:46:20 -0600 Subject: more global config ref cleanup (#7802) --- cmd/platform/server.go | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'cmd/platform') diff --git a/cmd/platform/server.go b/cmd/platform/server.go index c64b607d8..01f5a0da1 100644 --- a/cmd/platform/server.go +++ b/cmd/platform/server.go @@ -90,26 +90,30 @@ func runServer(configFileLocation string) { wsapi.Init(a, a.Srv.WebSocketRouter) web.Init(api3) - if !utils.IsLicensed() && len(utils.Cfg.SqlSettings.DataSourceReplicas) > 1 { + if !utils.IsLicensed() && len(a.Config().SqlSettings.DataSourceReplicas) > 1 { l4g.Warn(utils.T("store.sql.read_replicas_not_licensed.critical")) - utils.Cfg.SqlSettings.DataSourceReplicas = utils.Cfg.SqlSettings.DataSourceReplicas[:1] + a.UpdateConfig(func(cfg *model.Config) { + cfg.SqlSettings.DataSourceReplicas = cfg.SqlSettings.DataSourceReplicas[:1] + }) } if !utils.IsLicensed() { - utils.Cfg.TeamSettings.MaxNotificationsPerChannel = &MaxNotificationsPerChannelDefault + a.UpdateConfig(func(cfg *model.Config) { + cfg.TeamSettings.MaxNotificationsPerChannel = &MaxNotificationsPerChannelDefault + }) } a.ReloadConfig() // Enable developer settings if this is a "dev" build if model.BuildNumber == "dev" { - *utils.Cfg.ServiceSettings.EnableDeveloper = true + a.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableDeveloper = true }) } resetStatuses(a) // If we allow testing then listen for manual testing URL hits - if utils.Cfg.ServiceSettings.EnableTesting { + if a.Config().ServiceSettings.EnableTesting { manualtesting.Init(api3) } @@ -142,10 +146,10 @@ func runServer(configFileLocation string) { }) } - if *utils.Cfg.JobSettings.RunJobs { + if *a.Config().JobSettings.RunJobs { a.Jobs.StartWorkers() } - if *utils.Cfg.JobSettings.RunScheduler { + if *a.Config().JobSettings.RunScheduler { a.Jobs.StartSchedulers() } -- cgit v1.2.3-1-g7c22