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/session.go | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'app/session.go') diff --git a/app/session.go b/app/session.go index 03754398d..53170cec0 100644 --- a/app/session.go +++ b/app/session.go @@ -4,12 +4,11 @@ package app import ( + "fmt" "net/http" + "github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" - - l4g "github.com/alecthomas/log4go" ) func (a *App) CreateSession(session *model.Session) (*model.Session, *model.AppError) { @@ -171,10 +170,10 @@ func (a *App) RevokeSessionsForDeviceId(userId string, deviceId string, currentS sessions := result.Data.([]*model.Session) for _, session := range sessions { if session.DeviceId == deviceId && session.Id != currentSessionId { - l4g.Debug(utils.T("api.user.login.revoking.app_error"), session.Id, userId) + mlog.Debug(fmt.Sprintf("Revoking sessionId=%v for userId=%v re-login with same device Id", session.Id, userId), mlog.String("user_id", userId)) if err := a.RevokeSession(session); err != nil { // Soft error so we still remove the other sessions - l4g.Error(err.Error()) + mlog.Error(err.Error()) } } } @@ -233,7 +232,7 @@ func (a *App) UpdateLastActivityAtIfNeeded(session model.Session) { } if result := <-a.Srv.Store.Session().UpdateLastActivityAt(session.Id, now); result.Err != nil { - l4g.Error(utils.T("api.status.last_activity.error"), session.UserId, session.Id, result.Err) + mlog.Error(fmt.Sprintf("Failed to update LastActivityAt for user_id=%v and session_id=%v, err=%v", session.UserId, session.Id, result.Err), mlog.String("user_id", session.UserId)) } session.LastActivityAt = now @@ -256,11 +255,11 @@ func (a *App) CreateUserAccessToken(token *model.UserAccessToken) (*model.UserAc } if result := <-uchan; result.Err != nil { - l4g.Error(result.Err.Error()) + mlog.Error(result.Err.Error()) } else { user := result.Data.(*model.User) if err := a.SendUserAccessTokenAddedEmail(user.Email, user.Locale); err != nil { - l4g.Error(err.Error()) + mlog.Error(err.Error()) } } -- cgit v1.2.3-1-g7c22