From 7ed011745a544873f40f806f1803cb8a4998ba01 Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 26 Oct 2017 14:21:22 -0500 Subject: Remove more global refs / state (#7723) * remove more global refs / state * fix job enterprise initialization * fix api4 test compilation * saml api endpoints fix --- app/admin.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'app/admin.go') diff --git a/app/admin.go b/app/admin.go index fc792a3f0..a181fa251 100644 --- a/app/admin.go +++ b/app/admin.go @@ -114,7 +114,7 @@ func (a *App) InvalidateAllCaches() *model.AppError { func (a *App) InvalidateAllCachesSkipSend() { l4g.Info(utils.T("api.context.invalidate_all_caches")) - sessionCache.Purge() + a.sessionCache.Purge() ClearStatusCache() sqlstore.ClearChannelCaches() sqlstore.ClearUserCaches() @@ -133,7 +133,7 @@ func (a *App) GetConfig() *model.Config { func (a *App) ReloadConfig() { debug.FreeOSMemory() - utils.LoadConfig(utils.CfgFileName) + utils.LoadConfig(a.ConfigFileName()) // start/restart email batching job if necessary a.InitEmailBatching() @@ -157,8 +157,8 @@ func (a *App) SaveConfig(cfg *model.Config, sendConfigChangeClusterMessage bool) } utils.DisableConfigWatch() - utils.SaveConfig(utils.CfgFileName, cfg) - utils.LoadConfig(utils.CfgFileName) + utils.SaveConfig(a.ConfigFileName(), cfg) + utils.LoadConfig(a.ConfigFileName()) utils.EnableConfigWatch() if a.Metrics != nil { -- cgit v1.2.3-1-g7c22