summaryrefslogtreecommitdiffstats
path: root/app/config.go
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2018-04-27 12:49:45 -0700
committerGitHub <noreply@github.com>2018-04-27 12:49:45 -0700
commit686c2fbab7607d42183ae685a27ea3d7dce8c3f6 (patch)
tree53ed73cada57bc43f342ac10e2f842cddb095218 /app/config.go
parent2acbc77d78456d7ba76ceb687b18985d7d92f814 (diff)
downloadchat-686c2fbab7607d42183ae685a27ea3d7dce8c3f6.tar.gz
chat-686c2fbab7607d42183ae685a27ea3d7dce8c3f6.tar.bz2
chat-686c2fbab7607d42183ae685a27ea3d7dce8c3f6.zip
Structured logging (#8673)
* Implementing structured logging * Changes to en.json to allow refactor to run. * Fixing global logger * Structured logger initalization. * Add caller. * Do some log redirection. * Auto refactor * Cleaning up l4g reference and removing dependancy. * Removing junk. * Copyright headers. * Fixing tests * Revert "Changes to en.json to allow refactor to run." This reverts commit fd8249e99bcad0231e6ea65cd77c32aae9a54026. * Fixing some auto refactor strangeness and typo. * Making keys more human readable.
Diffstat (limited to 'app/config.go')
-rw-r--r--app/config.go8
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
}