From ce2b2be5de578bd9eb44b26e04db75ca61d67ca5 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 31 Oct 2017 09:39:31 -0500 Subject: Refactoring cfg refs and load / save functions (#7749) * refactoring cfg refs and load / save functions * improve error output --- app/admin.go | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'app/admin.go') diff --git a/app/admin.go b/app/admin.go index a181fa251..ef5a1c5d5 100644 --- a/app/admin.go +++ b/app/admin.go @@ -131,14 +131,6 @@ func (a *App) GetConfig() *model.Config { return cfg } -func (a *App) ReloadConfig() { - debug.FreeOSMemory() - utils.LoadConfig(a.ConfigFileName()) - - // start/restart email batching job if necessary - a.InitEmailBatching() -} - func (a *App) SaveConfig(cfg *model.Config, sendConfigChangeClusterMessage bool) *model.AppError { oldCfg := a.Config() cfg.SetDefaults() @@ -157,8 +149,11 @@ func (a *App) SaveConfig(cfg *model.Config, sendConfigChangeClusterMessage bool) } utils.DisableConfigWatch() - utils.SaveConfig(a.ConfigFileName(), cfg) - utils.LoadConfig(a.ConfigFileName()) + a.UpdateConfig(func(update *model.Config) { + *update = *cfg + }) + a.PersistConfig() + a.ReloadConfig() utils.EnableConfigWatch() if a.Metrics != nil { -- cgit v1.2.3-1-g7c22