From 686c2fbab7607d42183ae685a27ea3d7dce8c3f6 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Fri, 27 Apr 2018 12:49:45 -0700 Subject: 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. --- web/web.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'web/web.go') diff --git a/web/web.go b/web/web.go index c9d318397..56a5ab6ac 100644 --- a/web/web.go +++ b/web/web.go @@ -4,6 +4,7 @@ package web import ( + "fmt" "net/http" "path/filepath" "strings" @@ -11,20 +12,20 @@ import ( "github.com/NYTimes/gziphandler" "github.com/avct/uasurfer" - l4g "github.com/alecthomas/log4go" "github.com/mattermost/mattermost-server/api" + "github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/utils" ) func Init(api3 *api.API) { - l4g.Debug(utils.T("web.init.debug")) + mlog.Debug("Initializing web routes") mainrouter := api3.BaseRoutes.Root if *api3.App.Config().ServiceSettings.WebserverMode != "disabled" { staticDir, _ := utils.FindDir(model.CLIENT_DIR) - l4g.Debug("Using client directory at %v", staticDir) + mlog.Debug(fmt.Sprintf("Using client directory at %v", staticDir)) staticHandler := staticHandler(http.StripPrefix("/static/", http.FileServer(http.Dir(staticDir)))) pluginHandler := pluginHandler(api3.App.Config, http.StripPrefix("/static/plugins/", http.FileServer(http.Dir(*api3.App.Config().PluginSettings.ClientDirectory)))) -- cgit v1.2.3-1-g7c22