diff options
| author | Chris <ccbrown112@gmail.com> | 2017-10-31 09:39:31 -0500 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-10-31 10:39:31 -0400 |
| commit | ce2b2be5de578bd9eb44b26e04db75ca61d67ca5 (patch) | |
| tree | 54203a18ecfb167dcf1d7e0742cea0ed9aab220a /app/admin.go | |
| parent | b446d0aa0aa2bd3d87028b0543752eb539507481 (diff) | |
| download | chat-ce2b2be5de578bd9eb44b26e04db75ca61d67ca5.tar.gz chat-ce2b2be5de578bd9eb44b26e04db75ca61d67ca5.tar.bz2 chat-ce2b2be5de578bd9eb44b26e04db75ca61d67ca5.zip | |
Refactoring cfg refs and load / save functions (#7749)
* refactoring cfg refs and load / save functions
* improve error output
Diffstat (limited to 'app/admin.go')
| -rw-r--r-- | app/admin.go | 15 |
1 files changed, 5 insertions, 10 deletions
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 { |