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. --- app/authorization.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'app/authorization.go') diff --git a/app/authorization.go b/app/authorization.go index 2187472f7..f281b3e65 100644 --- a/app/authorization.go +++ b/app/authorization.go @@ -4,10 +4,11 @@ package app import ( + "fmt" "net/http" "strings" - l4g "github.com/alecthomas/log4go" + "github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/model" ) @@ -193,8 +194,8 @@ func (a *App) RolesGrantPermission(roleNames []string, permissionId string) bool if err != nil { // This should only happen if something is very broken. We can't realistically // recover the situation, so deny permission and log an error. - l4g.Error("Failed to get roles from database with role names: " + strings.Join(roleNames, ",")) - l4g.Error(err) + mlog.Error("Failed to get roles from database with role names: " + strings.Join(roleNames, ",")) + mlog.Error(fmt.Sprint(err)) return false } -- cgit v1.2.3-1-g7c22