diff --git a/store/searchlayer/channel_layer.go b/store/searchlayer/channel_layer.go index 4db1c977b2..1ff405fc00 100644 --- a/store/searchlayer/channel_layer.go +++ b/store/searchlayer/channel_layer.go @@ -22,7 +22,7 @@ func (c *SearchChannelStore) deleteChannelIndex(channel *model.Channel) { if engine.IsIndexingEnabled() { runIndexFn(engine, func(engineCopy searchengine.SearchEngineInterface) { if err := engineCopy.DeleteChannel(channel); err != nil { - mlog.Error("Encountered error deleting channel", mlog.String("channel_id", channel.Id), mlog.String("search_engine", engineCopy.GetName()), mlog.Err(err)) + mlog.Warn("Encountered error deleting channel", mlog.String("channel_id", channel.Id), mlog.String("search_engine", engineCopy.GetName()), mlog.Err(err)) } mlog.Debug("Removed channel from index in search engine", mlog.String("search_engine", engineCopy.GetName()), mlog.String("channel_id", channel.Id)) }) @@ -37,7 +37,7 @@ func (c *SearchChannelStore) indexChannel(channel *model.Channel) { if engine.IsIndexingEnabled() { runIndexFn(engine, func(engineCopy searchengine.SearchEngineInterface) { if err := engineCopy.IndexChannel(channel); err != nil { - mlog.Error("Encountered error indexing channel", mlog.String("channel_id", channel.Id), mlog.String("search_engine", engineCopy.GetName()), mlog.Err(err)) + mlog.Warn("Encountered error indexing channel", mlog.String("channel_id", channel.Id), mlog.String("search_engine", engineCopy.GetName()), mlog.Err(err)) } mlog.Debug("Indexed channel in search engine", mlog.String("search_engine", engineCopy.GetName()), mlog.String("channel_id", channel.Id)) }) @@ -68,7 +68,7 @@ func (c *SearchChannelStore) UpdateMember(cm *model.ChannelMember) (*model.Chann c.rootStore.indexUserFromID(cm.UserId) channel, channelErr := c.ChannelStore.Get(member.ChannelId, true) if channelErr != nil { - mlog.Error("Encountered error indexing user in channel", mlog.String("channel_id", member.ChannelId), mlog.Err(channelErr)) + mlog.Warn("Encountered error indexing user in channel", mlog.String("channel_id", member.ChannelId), mlog.Err(channelErr)) } else { c.rootStore.indexUserFromID(channel.CreatorId) } @@ -82,7 +82,7 @@ func (c *SearchChannelStore) SaveMember(cm *model.ChannelMember) (*model.Channel c.rootStore.indexUserFromID(cm.UserId) channel, channelErr := c.ChannelStore.Get(member.ChannelId, true) if channelErr != nil { - mlog.Error("Encountered error indexing user in channel", mlog.String("channel_id", member.ChannelId), mlog.Err(channelErr)) + mlog.Warn("Encountered error indexing user in channel", mlog.String("channel_id", member.ChannelId), mlog.Err(channelErr)) } else { c.rootStore.indexUserFromID(channel.CreatorId) } @@ -136,7 +136,7 @@ func (c *SearchChannelStore) AutocompleteInTeam(teamId string, term string, incl if engine.IsAutocompletionEnabled() { channelList, err = c.searchAutocompleteChannels(engine, teamId, term, includeDeleted) if err != nil { - mlog.Error("Encountered error on AutocompleteChannels through SearchEngine. Falling back to default autocompletion.", mlog.String("search_engine", engine.GetName()), mlog.Err(err)) + mlog.Warn("Encountered error on AutocompleteChannels through SearchEngine. Falling back to default autocompletion.", mlog.String("search_engine", engine.GetName()), mlog.Err(err)) continue } allFailed = false @@ -192,7 +192,7 @@ func (c *SearchChannelStore) PermanentDeleteMembersByUser(userId string) error { func (c *SearchChannelStore) RemoveAllDeactivatedMembers(channelId string) error { profiles, errProfiles := c.rootStore.User().GetAllProfilesInChannel(channelId, true) if errProfiles != nil { - mlog.Error("Encountered error indexing users for channel", mlog.String("channel_id", channelId), mlog.Err(errProfiles)) + mlog.Warn("Encountered error indexing users for channel", mlog.String("channel_id", channelId), mlog.Err(errProfiles)) } err := c.ChannelStore.RemoveAllDeactivatedMembers(channelId) @@ -209,7 +209,7 @@ func (c *SearchChannelStore) RemoveAllDeactivatedMembers(channelId string) error func (c *SearchChannelStore) PermanentDeleteMembersByChannel(channelId string) error { profiles, errProfiles := c.rootStore.User().GetAllProfilesInChannel(channelId, true) if errProfiles != nil { - mlog.Error("Encountered error indexing users for channel", mlog.String("channel_id", channelId), mlog.Err(errProfiles)) + mlog.Warn("Encountered error indexing users for channel", mlog.String("channel_id", channelId), mlog.Err(errProfiles)) } err := c.ChannelStore.PermanentDeleteMembersByChannel(channelId) @@ -224,7 +224,7 @@ func (c *SearchChannelStore) PermanentDeleteMembersByChannel(channelId string) e func (c *SearchChannelStore) PermanentDelete(channelId string) error { channel, channelErr := c.ChannelStore.Get(channelId, true) if channelErr != nil { - mlog.Error("Encountered error deleting channel", mlog.String("channel_id", channelId), mlog.Err(channelErr)) + mlog.Warn("Encountered error deleting channel", mlog.String("channel_id", channelId), mlog.Err(channelErr)) } err := c.ChannelStore.PermanentDelete(channelId) if err == nil && channelErr == nil { diff --git a/store/searchlayer/post_layer.go b/store/searchlayer/post_layer.go index b76d2fb3b7..d30984f06f 100644 --- a/store/searchlayer/post_layer.go +++ b/store/searchlayer/post_layer.go @@ -26,7 +26,7 @@ func (s SearchPostStore) indexPost(post *model.Post) { return } if err := engineCopy.IndexPost(post, channel.TeamId); err != nil { - mlog.Error("Encountered error indexing post", mlog.String("post_id", post.Id), mlog.String("search_engine", engineCopy.GetName()), mlog.Err(err)) + mlog.Warn("Encountered error indexing post", mlog.String("post_id", post.Id), mlog.String("search_engine", engineCopy.GetName()), mlog.Err(err)) } mlog.Debug("Indexed post in search engine", mlog.String("search_engine", engineCopy.GetName()), mlog.String("post_id", post.Id)) }) @@ -39,7 +39,7 @@ func (s SearchPostStore) deletePostIndex(post *model.Post) { if engine.IsIndexingEnabled() { runIndexFn(engine, func(engineCopy searchengine.SearchEngineInterface) { if err := engineCopy.DeletePost(post); err != nil { - mlog.Error("Encountered error deleting post", mlog.String("post_id", post.Id), mlog.String("search_engine", engineCopy.GetName()), mlog.Err(err)) + mlog.Warn("Encountered error deleting post", mlog.String("post_id", post.Id), mlog.String("search_engine", engineCopy.GetName()), mlog.Err(err)) } mlog.Debug("Removed post from the index in search engine", mlog.String("search_engine", engineCopy.GetName()), mlog.String("post_id", post.Id)) }) @@ -52,7 +52,7 @@ func (s SearchPostStore) deleteChannelPostsIndex(channelID string) { if engine.IsIndexingEnabled() { runIndexFn(engine, func(engineCopy searchengine.SearchEngineInterface) { if err := engineCopy.DeleteChannelPosts(channelID); err != nil { - mlog.Error("Encountered error deleting channel posts", mlog.String("channel_id", channelID), mlog.String("search_engine", engineCopy.GetName()), mlog.Err(err)) + mlog.Warn("Encountered error deleting channel posts", mlog.String("channel_id", channelID), mlog.String("search_engine", engineCopy.GetName()), mlog.Err(err)) } mlog.Debug("Removed all channel posts from the index in search engine", mlog.String("channel_id", channelID), mlog.String("search_engine", engineCopy.GetName())) }) @@ -65,7 +65,7 @@ func (s SearchPostStore) deleteUserPostsIndex(userID string) { if engine.IsIndexingEnabled() { runIndexFn(engine, func(engineCopy searchengine.SearchEngineInterface) { if err := engineCopy.DeleteUserPosts(userID); err != nil { - mlog.Error("Encountered error deleting user posts", mlog.String("user_id", userID), mlog.String("search_engine", engineCopy.GetName()), mlog.Err(err)) + mlog.Warn("Encountered error deleting user posts", mlog.String("user_id", userID), mlog.String("search_engine", engineCopy.GetName()), mlog.Err(err)) } mlog.Debug("Removed all user posts from the index in search engine", mlog.String("user_id", userID), mlog.String("search_engine", engineCopy.GetName())) }) @@ -168,7 +168,7 @@ func (s SearchPostStore) SearchPostsInTeamForUser(paramsList []*model.SearchPara if engine.IsSearchEnabled() { results, err := s.searchPostsInTeamForUserByEngine(engine, paramsList, userId, teamId, page, perPage) if err != nil { - mlog.Error("Encountered error on SearchPostsInTeamForUser.", mlog.String("search_engine", engine.GetName()), mlog.Err(err)) + mlog.Warn("Encountered error on SearchPostsInTeamForUser.", mlog.String("search_engine", engine.GetName()), mlog.Err(err)) continue } mlog.Debug("Using the first available search engine", mlog.String("search_engine", engine.GetName())) diff --git a/store/searchlayer/user_layer.go b/store/searchlayer/user_layer.go index b57c950e3a..4afd90c02b 100644 --- a/store/searchlayer/user_layer.go +++ b/store/searchlayer/user_layer.go @@ -37,7 +37,7 @@ func (s *SearchUserStore) Search(teamId, term string, options *model.UserSearchO if engine.IsSearchEnabled() { listOfAllowedChannels, nErr := s.getListOfAllowedChannelsForTeam(teamId, options.ViewRestrictions) if nErr != nil { - mlog.Error("Encountered error on Search.", mlog.String("search_engine", engine.GetName()), mlog.Err(nErr)) + mlog.Warn("Encountered error on Search.", mlog.String("search_engine", engine.GetName()), mlog.Err(nErr)) continue } @@ -49,13 +49,13 @@ func (s *SearchUserStore) Search(teamId, term string, options *model.UserSearchO usersIds, err := engine.SearchUsersInTeam(teamId, listOfAllowedChannels, sanitizedTerm, options) if err != nil { - mlog.Error("Encountered error on Search", mlog.String("search_engine", engine.GetName()), mlog.Err(err)) + mlog.Warn("Encountered error on Search", mlog.String("search_engine", engine.GetName()), mlog.Err(err)) continue } users, nErr := s.UserStore.GetProfileByIds(usersIds, nil, false) if nErr != nil { - mlog.Error("Encountered error on Search", mlog.String("search_engine", engine.GetName()), mlog.Err(nErr)) + mlog.Warn("Encountered error on Search", mlog.String("search_engine", engine.GetName()), mlog.Err(nErr)) continue } @@ -90,7 +90,7 @@ func (s *SearchUserStore) Save(user *model.User) (*model.User, error) { func (s *SearchUserStore) PermanentDelete(userId string) error { user, userErr := s.UserStore.Get(userId) if userErr != nil { - mlog.Error("Encountered error deleting user", mlog.String("user_id", userId), mlog.Err(userErr)) + mlog.Warn("Encountered error deleting user", mlog.String("user_id", userId), mlog.Err(userErr)) } err := s.UserStore.PermanentDelete(userId) if err == nil && userErr == nil { @@ -196,7 +196,7 @@ func (s *SearchUserStore) AutocompleteUsersInChannel(teamId, channelId, term str if engine.IsAutocompletionEnabled() { listOfAllowedChannels, nErr := s.getListOfAllowedChannelsForTeam(teamId, options.ViewRestrictions) if nErr != nil { - mlog.Error("Encountered error on AutocompleteUsersInChannel.", mlog.String("search_engine", engine.GetName()), mlog.Err(nErr)) + mlog.Warn("Encountered error on AutocompleteUsersInChannel.", mlog.String("search_engine", engine.GetName()), mlog.Err(nErr)) continue } if listOfAllowedChannels != nil && len(listOfAllowedChannels) == 0 { @@ -205,7 +205,7 @@ func (s *SearchUserStore) AutocompleteUsersInChannel(teamId, channelId, term str options.ListOfAllowedChannels = listOfAllowedChannels autocomplete, nErr := s.autocompleteUsersInChannelByEngine(engine, teamId, channelId, term, options) if nErr != nil { - mlog.Error("Encountered error on AutocompleteUsersInChannel.", mlog.String("search_engine", engine.GetName()), mlog.Err(nErr)) + mlog.Warn("Encountered error on AutocompleteUsersInChannel.", mlog.String("search_engine", engine.GetName()), mlog.Err(nErr)) continue } mlog.Debug("Using the first available search engine", mlog.String("search_engine", engine.GetName())) diff --git a/store/sqlstore/integrity.go b/store/sqlstore/integrity.go index 7be1112c44..651210cf04 100644 --- a/store/sqlstore/integrity.go +++ b/store/sqlstore/integrity.go @@ -66,7 +66,7 @@ func checkParentChildIntegrity(ss *SqlStore, config relationalCheckConfig) model config.sortRecords = true data.Records, result.Err = getOrphanedRecords(ss, config) if result.Err != nil { - mlog.Error(result.Err.Error()) + mlog.Error("Error while getting orphaned records", mlog.Err(result.Err)) return result } data.ParentName = config.parentName diff --git a/store/sqlstore/post_store.go b/store/sqlstore/post_store.go index ae2e012228..8c78d31f5d 100644 --- a/store/sqlstore/post_store.go +++ b/store/sqlstore/post_store.go @@ -171,7 +171,7 @@ func (s *SqlPostStore) SaveMultiple(posts []*model.Post) ([]*model.Post, int, er } if err = s.updateThreadsFromPosts(transaction, posts); err != nil { - mlog.Error("Error updating posts, thread update failed", mlog.Err(err)) + mlog.Warn("Error updating posts, thread update failed", mlog.Err(err)) } if err = transaction.Commit(); err != nil { @@ -181,13 +181,13 @@ func (s *SqlPostStore) SaveMultiple(posts []*model.Post) ([]*model.Post, int, er for channelId, count := range channelNewPosts { if _, err = s.GetMaster().Exec("UPDATE Channels SET LastPostAt = GREATEST(:LastPostAt, LastPostAt), TotalMsgCount = TotalMsgCount + :Count WHERE Id = :ChannelId", map[string]interface{}{"LastPostAt": maxDateNewPosts[channelId], "ChannelId": channelId, "Count": count}); err != nil { - mlog.Error("Error updating Channel LastPostAt.", mlog.Err(err)) + mlog.Warn("Error updating Channel LastPostAt.", mlog.Err(err)) } } for rootId := range rootIds { if _, err = s.GetMaster().Exec("UPDATE Posts SET UpdateAt = :UpdateAt WHERE Id = :RootId", map[string]interface{}{"UpdateAt": maxDateRootIds[rootId], "RootId": rootId}); err != nil { - mlog.Error("Error updating Post UpdateAt.", mlog.Err(err)) + mlog.Warn("Error updating Post UpdateAt.", mlog.Err(err)) } } @@ -205,7 +205,7 @@ func (s *SqlPostStore) SaveMultiple(posts []*model.Post) ([]*model.Post, int, er if len(unknownRepliesPosts) > 0 { if err := s.populateReplyCount(unknownRepliesPosts); err != nil { - mlog.Error("Unable to populate the reply count in some posts.", mlog.Err(err)) + mlog.Warn("Unable to populate the reply count in some posts.", mlog.Err(err)) } } @@ -1668,7 +1668,7 @@ func (s *SqlPostStore) determineMaxPostSize() int { AND column_name = 'Message' LIMIT 0, 1 `); err != nil { - mlog.Error("Unable to determine the maximum supported post size", mlog.Err(err)) + mlog.Warn("Unable to determine the maximum supported post size", mlog.Err(err)) } } else { mlog.Warn("No implementation found to determine the maximum supported post size")