diff options
| author | Chris <ccbrown112@gmail.com> | 2018-01-11 15:23:41 -0600 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2018-01-11 13:23:41 -0800 |
| commit | 1d9efd0e39a9663bb2fbf52b3353fe21ac3b6954 (patch) | |
| tree | 5518bf9683e2fcbcb6b4e0acd3643a3146574ec4 /app/admin.go | |
| parent | 6990d052d5e95295e729aae28a0d30bfdcb98573 (diff) | |
| download | chat-1d9efd0e39a9663bb2fbf52b3353fe21ac3b6954.tar.gz chat-1d9efd0e39a9663bb2fbf52b3353fe21ac3b6954.tar.bz2 chat-1d9efd0e39a9663bb2fbf52b3353fe21ac3b6954.zip | |
Remove global config watcher (#8080)
* remove global config watcher
* keep config watcher disabled for tests
* compile fix
* fix resource leak
Diffstat (limited to 'app/admin.go')
| -rw-r--r-- | app/admin.go | 4 |
1 files changed, 2 insertions, 2 deletions
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 { |