diff --git a/server/channels/app/import_functions.go b/server/channels/app/import_functions.go index 00cade7baa6..987004a3bf3 100644 --- a/server/channels/app/import_functions.go +++ b/server/channels/app/import_functions.go @@ -1318,7 +1318,7 @@ func (a *App) importAttachment(c request.CTX, data *imports.AttachmentImportData oldHash := sha1.Sum(oldFileData) if bytes.Equal(oldHash[:], newHash[:]) { - mlog.Info("Skipping uploading of file because name already exists", mlog.Any("file_name", name)) + mlog.Info("Skipping uploading of file because name already exists", mlog.String("file_name", name)) return oldFile, nil } } @@ -1645,7 +1645,7 @@ func (a *App) uploadAttachments(c request.CTX, attachments *[]imports.Attachment func (a *App) updateFileInfoWithPostId(post *model.Post) { for _, fileID := range post.FileIds { if err := a.Srv().Store().FileInfo().AttachToPost(fileID, post.Id, post.ChannelId, post.UserId); err != nil { - mlog.Error("Error attaching files to post.", mlog.String("post_id", post.Id), mlog.Any("post_file_ids", post.FileIds), mlog.Err(err)) + mlog.Error("Error attaching files to post.", mlog.String("post_id", post.Id), mlog.Array("post_file_ids", post.FileIds), mlog.Err(err)) } } } diff --git a/server/channels/app/platform/web_conn.go b/server/channels/app/platform/web_conn.go index 699d4da485b..ddd4eb1c966 100644 --- a/server/channels/app/platform/web_conn.go +++ b/server/channels/app/platform/web_conn.go @@ -511,7 +511,7 @@ func (wc *WebConn) writePump() { case <-authTicker.C: if wc.GetSessionToken() == "" { - mlog.Debug("websocket.authTicker: did not authenticate", mlog.Any("ip_address", wc.WebSocket.RemoteAddr())) + mlog.Debug("websocket.authTicker: did not authenticate", mlog.Stringer("ip_address", wc.WebSocket.RemoteAddr())) return } authTicker.Stop() diff --git a/server/channels/app/post.go b/server/channels/app/post.go index a229ff48372..2fb26b05fe8 100644 --- a/server/channels/app/post.go +++ b/server/channels/app/post.go @@ -362,7 +362,7 @@ func (a *App) CreatePost(c request.CTX, post *model.Post, channel *model.Channel if len(post.FileIds) > 0 { if err = a.attachFilesToPost(post); err != nil { - c.Logger().Warn("Encountered error attaching files to post", mlog.String("post_id", post.Id), mlog.Any("file_ids", post.FileIds), mlog.Err(err)) + c.Logger().Warn("Encountered error attaching files to post", mlog.String("post_id", post.Id), mlog.Array("file_ids", post.FileIds), mlog.Err(err)) } if a.Metrics() != nil { diff --git a/server/channels/app/syncables.go b/server/channels/app/syncables.go index bab5e55ff9e..390409ca048 100644 --- a/server/channels/app/syncables.go +++ b/server/channels/app/syncables.go @@ -216,7 +216,7 @@ func (a *App) SyncSyncableRoles(syncableID string, syncableType model.GroupSynca a.Log().Info( fmt.Sprintf("Permitted admins for %s", syncableType), mlog.String(strings.ToLower(fmt.Sprintf("%s_id", syncableType)), syncableID), - mlog.Any("permitted_admins", permittedAdmins), + mlog.Array("permitted_admins", permittedAdmins), ) switch syncableType { diff --git a/server/platform/services/sharedchannel/sync_send_remote.go b/server/platform/services/sharedchannel/sync_send_remote.go index 6da93e69c71..4b878205364 100644 --- a/server/platform/services/sharedchannel/sync_send_remote.go +++ b/server/platform/services/sharedchannel/sync_send_remote.go @@ -428,7 +428,7 @@ func (scs *Service) sendUserSyncData(sd *syncData) error { scs.server.Log().Log(mlog.LvlSharedChannelServiceError, "Response indicates error for user(s) sync", mlog.String("channel_id", sd.task.channelID), mlog.String("remote_id", sd.rc.RemoteId), - mlog.Any("users", syncResp.UserErrors), + mlog.Array("users", syncResp.UserErrors), ) } }) @@ -460,7 +460,7 @@ func (scs *Service) sendPostSyncData(sd *syncData) error { scs.server.Log().Log(mlog.LvlSharedChannelServiceError, "Response indicates error for post(s) sync", mlog.String("channel_id", sd.task.channelID), mlog.String("remote_id", sd.rc.RemoteId), - mlog.Any("posts", syncResp.PostErrors), + mlog.Array("posts", syncResp.PostErrors), ) for _, postID := range syncResp.PostErrors { @@ -481,7 +481,7 @@ func (scs *Service) sendReactionSyncData(sd *syncData) error { scs.server.Log().Log(mlog.LvlSharedChannelServiceError, "Response indicates error for reactions(s) sync", mlog.String("channel_id", sd.task.channelID), mlog.String("remote_id", sd.rc.RemoteId), - mlog.Any("reaction_posts", syncResp.ReactionErrors), + mlog.Array("reaction_posts", syncResp.ReactionErrors), ) } }) diff --git a/server/public/model/group.go b/server/public/model/group.go index b4d1423237f..9fced068369 100644 --- a/server/public/model/group.go +++ b/server/public/model/group.go @@ -62,6 +62,10 @@ func (group *Group) Auditable() map[string]interface{} { } } +func (group *Group) LogClone() any { + return group.Auditable() +} + type GroupWithUserIds struct { Group UserIds []string `json:"user_ids"`