diff options
| author | Christopher Speller <crspeller@gmail.com> | 2018-04-27 14:12:01 -0700 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2018-04-27 14:12:01 -0700 |
| commit | eb9ff34fcfa51cd8205841a02f3d3d61ec5be8fa (patch) | |
| tree | ed01fd9488bd86f6c2daf0b299dff5beb43973db /store/sqlstore/channel_member_history_store.go | |
| parent | 2386acb3ddabd8827e21b1862c338a8b13a25de6 (diff) | |
| parent | 2e6b3da1d3466db379fef0d61a23e2878d17ee9d (diff) | |
| download | chat-eb9ff34fcfa51cd8205841a02f3d3d61ec5be8fa.tar.gz chat-eb9ff34fcfa51cd8205841a02f3d3d61ec5be8fa.tar.bz2 chat-eb9ff34fcfa51cd8205841a02f3d3d61ec5be8fa.zip | |
Merge branch 'master' into advanced-permissions-phase-2
Diffstat (limited to 'store/sqlstore/channel_member_history_store.go')
| -rw-r--r-- | store/sqlstore/channel_member_history_store.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/store/sqlstore/channel_member_history_store.go b/store/sqlstore/channel_member_history_store.go index 6fc78b514..70ad16467 100644 --- a/store/sqlstore/channel_member_history_store.go +++ b/store/sqlstore/channel_member_history_store.go @@ -4,11 +4,12 @@ package sqlstore import ( + "fmt" "net/http" "database/sql" - l4g "github.com/alecthomas/log4go" + "github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/store" ) @@ -60,7 +61,7 @@ func (s SqlChannelMemberHistoryStore) LogLeaveEvent(userId string, channelId str result.Err = model.NewAppError("SqlChannelMemberHistoryStore.LogLeaveEvent", "store.sql_channel_member_history.log_leave_event.update_error", params, err.Error(), http.StatusInternalServerError) } else if rows, err := sqlResult.RowsAffected(); err == nil && rows != 1 { // there was no join event to update - this is best effort, so no need to raise an error - l4g.Warn("Channel join event for user %v and channel %v not found", userId, channelId) + mlog.Warn(fmt.Sprintf("Channel join event for user %v and channel %v not found", userId, channelId), mlog.String("user_id", userId)) } }) } |