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/config.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/config.go')
-rw-r--r-- | app/config.go | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/app/config.go b/app/config.go index 75d38e24a..b4fbfe725 100644 --- a/app/config.go +++ b/app/config.go @@ -17,8 +17,7 @@ import ( "strconv" "strings" - l4g "github.com/alecthomas/log4go" - + "github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/utils" ) @@ -60,9 +59,6 @@ func (a *App) LoadConfig(configFile string) *model.AppError { a.configFile = configPath - utils.ConfigureLog(&cfg.LogSettings) - l4g.Info("Using config file at %s", configPath) - a.config.Store(cfg) a.envConfig = envConfig @@ -101,7 +97,7 @@ func (a *App) EnableConfigWatch() { a.ReloadConfig() }) if err != nil { - l4g.Error(err) + mlog.Error(fmt.Sprint(err)) } a.configWatcher = configWatcher } |