diff options
author | Martin Kraft <martinkraft@gmail.com> | 2018-05-01 18:59:20 -0400 |
---|---|---|
committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-01 18:59:20 -0400 |
commit | ff6c42309c4dd328b5841cfeef6b59ea59a4379c (patch) | |
tree | c2c3b4938588549ea69653a46d98b27f6fe37b80 /app/config.go | |
parent | 2386acb3ddabd8827e21b1862c338a8b13a25de6 (diff) | |
parent | e73f1d73143ebba9c7e80d21c45bba9b61f2611c (diff) | |
download | chat-ff6c42309c4dd328b5841cfeef6b59ea59a4379c.tar.gz chat-ff6c42309c4dd328b5841cfeef6b59ea59a4379c.tar.bz2 chat-ff6c42309c4dd328b5841cfeef6b59ea59a4379c.zip |
Merge remote-tracking branch 'origin/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 } |