From 1d9efd0e39a9663bb2fbf52b3353fe21ac3b6954 Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 11 Jan 2018 15:23:41 -0600 Subject: Remove global config watcher (#8080) * remove global config watcher * keep config watcher disabled for tests * compile fix * fix resource leak --- app/admin.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/admin.go') diff --git a/app/admin.go b/app/admin.go index e46d9073c..e7d1eb9ed 100644 --- a/app/admin.go +++ b/app/admin.go @@ -173,13 +173,13 @@ func (a *App) SaveConfig(cfg *model.Config, sendConfigChangeClusterMessage bool) return model.NewAppError("saveConfig", "ent.cluster.save_config.error", nil, "", http.StatusForbidden) } - utils.DisableConfigWatch() + a.DisableConfigWatch() a.UpdateConfig(func(update *model.Config) { *update = *cfg }) a.PersistConfig() a.ReloadConfig() - utils.EnableConfigWatch() + a.EnableConfigWatch() if a.Metrics != nil { if *a.Config().MetricsSettings.Enable { -- cgit v1.2.3-1-g7c22