diff options
author | Christopher Speller <crspeller@gmail.com> | 2018-04-27 14:12:01 -0700 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2018-04-27 14:12:01 -0700 |
commit | eb9ff34fcfa51cd8205841a02f3d3d61ec5be8fa (patch) | |
tree | ed01fd9488bd86f6c2daf0b299dff5beb43973db /app/admin.go | |
parent | 2386acb3ddabd8827e21b1862c338a8b13a25de6 (diff) | |
parent | 2e6b3da1d3466db379fef0d61a23e2878d17ee9d (diff) | |
download | chat-eb9ff34fcfa51cd8205841a02f3d3d61ec5be8fa.tar.gz chat-eb9ff34fcfa51cd8205841a02f3d3d61ec5be8fa.tar.bz2 chat-eb9ff34fcfa51cd8205841a02f3d3d61ec5be8fa.zip |
Merge branch 'master' into advanced-permissions-phase-2
Diffstat (limited to 'app/admin.go')
-rw-r--r-- | app/admin.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/admin.go b/app/admin.go index 60b71505a..892e2d16b 100644 --- a/app/admin.go +++ b/app/admin.go @@ -13,7 +13,7 @@ import ( "net/http" - l4g "github.com/alecthomas/log4go" + "github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/utils" ) @@ -137,7 +137,7 @@ func (a *App) InvalidateAllCaches() *model.AppError { } func (a *App) InvalidateAllCachesSkipSend() { - l4g.Info(utils.T("api.context.invalidate_all_caches")) + mlog.Info("Purging all caches") a.sessionCache.Purge() ClearStatusCache() a.Srv.Store.Channel().ClearCaches() @@ -209,7 +209,7 @@ func (a *App) SaveConfig(cfg *model.Config, sendConfigChangeClusterMessage bool) func (a *App) RecycleDatabaseConnection() { oldStore := a.Srv.Store - l4g.Warn(utils.T("api.admin.recycle_db_start.warn")) + mlog.Warn("Attempting to recycle the database connection.") a.Srv.Store = a.newStore() a.Jobs.Store = a.Srv.Store @@ -218,7 +218,7 @@ func (a *App) RecycleDatabaseConnection() { oldStore.Close() } - l4g.Warn(utils.T("api.admin.recycle_db_end.warn")) + mlog.Warn("Finished recycling the database connection.") } func (a *App) TestEmail(userId string, cfg *model.Config) *model.AppError { |