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/status.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/status.go')
-rw-r--r-- | app/status.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/status.go b/app/status.go index 64d5379ef..d8e93e2f1 100644 --- a/app/status.go +++ b/app/status.go @@ -4,8 +4,9 @@ package app import ( - l4g "github.com/alecthomas/log4go" + "fmt" + "github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/store" "github.com/mattermost/mattermost-server/utils" @@ -208,7 +209,7 @@ func (a *App) SetStatusOnline(userId string, sessionId string, manual bool) { } if result := <-schan; result.Err != nil { - l4g.Error(utils.T("api.status.save_status.error"), userId, result.Err) + mlog.Error(fmt.Sprintf("Failed to save status for user_id=%v, err=%v", userId, result.Err), mlog.String("user_id", userId)) } } @@ -292,7 +293,7 @@ func (a *App) SaveAndBroadcastStatus(status *model.Status) *model.AppError { a.AddStatusCache(status) if result := <-a.Srv.Store.Status().SaveOrUpdate(status); result.Err != nil { - l4g.Error(utils.T("api.status.save_status.error"), status.UserId, result.Err) + mlog.Error(fmt.Sprintf("Failed to save status for user_id=%v, err=%v", status.UserId, result.Err)) } event := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_STATUS_CHANGE, "", "", status.UserId, nil) @@ -320,7 +321,7 @@ func (a *App) SetStatusOutOfOffice(userId string) { a.AddStatusCache(status) if result := <-a.Srv.Store.Status().SaveOrUpdate(status); result.Err != nil { - l4g.Error(utils.T("api.status.save_status.error"), userId, result.Err) + mlog.Error(fmt.Sprintf("Failed to save status for user_id=%v, err=%v", userId, result.Err), mlog.String("user_id", userId)) } event := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_STATUS_CHANGE, "", "", status.UserId, nil) |