[MM-31359] remove duplicated error logs (#16583)

* remove duplicated error logs

* reflect review comments

* add context

* add error details
Этот коммит содержится в:
Ibrahim Serdar Acikgoz
2020-12-29 09:48:36 +03:00
коммит произвёл GitHub
родитель 727a158e9a
Коммит 40e16ba07f
19 изменённых файлов: 16 добавлений и 47 удалений

Просмотреть файл

@@ -371,7 +371,6 @@ func (a *App) notifyAdminsOfWarnMetricStatus(warnMetricId string, isE0Edition bo
channel, appErr := a.GetOrCreateDirectChannel(bot.UserId, sysAdmin.Id)
if appErr != nil {
mlog.Error("Cannot create channel for system bot notification!", mlog.String("Admin Id", sysAdmin.Id))
return appErr
}
@@ -484,7 +483,6 @@ func (a *App) NotifyAndSetWarnMetricAck(warnMetricId string, sender *model.User,
bodyPage.Props["Title"] = warnMetricDisplayTexts.EmailBody
if err := mailservice.SendMailUsingConfig(model.MM_SUPPORT_ADVISOR_ADDRESS, subject, bodyPage.Render(), a.Config(), false, sender.Email); err != nil {
mlog.Error("Error while sending email", mlog.String("destination email", model.MM_SUPPORT_ADVISOR_ADDRESS), mlog.Err(err))
return model.NewAppError("NotifyAndSetWarnMetricAck", "api.email.send_warn_metric_ack.failure.app_error", map[string]interface{}{"Error": err.Error()}, "", http.StatusInternalServerError)
}
}
@@ -526,7 +524,6 @@ func (a *App) setWarnMetricsStatusForId(warnMetricId string, status string) *mod
Name: warnMetricId,
Value: status,
}); err != nil {
mlog.Error("Unable to write to database.", mlog.Err(err))
return model.NewAppError("setWarnMetricsStatusForId", "app.system.warn_metric.store.app_error", map[string]interface{}{"WarnMetricName": warnMetricId}, err.Error(), http.StatusInternalServerError)
}
return nil
@@ -544,7 +541,6 @@ func (a *App) RequestLicenseAndAckWarnMetric(warnMetricId string, isBot bool) *m
registeredUsersCount, err := a.Srv().Store.User().Count(model.UserCountOptions{})
if err != nil {
mlog.Error("Error retrieving the number of registered users", mlog.Err(err))
return model.NewAppError("RequestLicenseAndAckWarnMetric", "api.license.request_trial_license.fail_get_user_count.app_error", nil, err.Error(), http.StatusBadRequest)
}

Просмотреть файл

@@ -4,7 +4,6 @@
package app
import (
"github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/v5/model"
)
@@ -57,7 +56,6 @@ func (a *App) SendAutoResponse(channel *model.Channel, receiver *model.User, pos
}
if _, err := a.CreatePost(autoResponderPost, channel, false, false); err != nil {
mlog.Error(err.Error())
return false, err
}

Просмотреть файл

@@ -58,7 +58,6 @@ func (a *App) CreateBot(bot *model.Bot) (*model.Bot, *model.AppError) {
ownerUser, err := a.Srv().Store.User().Get(bot.OwnerId)
var nfErr *store.ErrNotFound
if err != nil && !errors.As(err, &nfErr) {
mlog.Error(err.Error())
return nil, model.NewAppError("CreateBot", "app.user.get.app_error", nil, err.Error(), http.StatusInternalServerError)
} else if ownerUser != nil {
// Send a message to the bot's creator to inform them that the bot needs to be added
@@ -88,14 +87,12 @@ func (a *App) getOrCreateWarnMetricsBot(botDef *model.Bot) (*model.Bot, *model.A
botUser, appErr := a.GetUserByUsername(botDef.Username)
if appErr != nil {
if appErr.StatusCode != http.StatusNotFound {
mlog.Error(appErr.Error())
return nil, appErr
}
// cannot find this bot user, save the user
user, nErr := a.Srv().Store.User().Save(model.UserFromBot(botDef))
if nErr != nil {
mlog.Error(nErr.Error())
var appError *model.AppError
var invErr *store.ErrInvalidInput
switch {

Просмотреть файл

@@ -108,7 +108,6 @@ func (a *App) JoinDefaultChannels(teamId string, user *model.User, shouldBeAdmin
_, nErr = a.Srv().Store.Channel().SaveMember(cm)
if histErr := a.Srv().Store.ChannelMemberHistory().LogJoinEvent(user.Id, channel.Id, model.GetMillis()); histErr != nil {
mlog.Error("Failed to update ChannelMemberHistory table", mlog.Err(histErr))
return model.NewAppError("JoinDefaultChannels", "app.channel_member_history.log_join_event.internal_error", nil, histErr.Error(), http.StatusInternalServerError)
}
@@ -298,7 +297,6 @@ func (a *App) CreateChannel(channel *model.Channel, addMember bool) (*model.Chan
}
if err := a.Srv().Store.ChannelMemberHistory().LogJoinEvent(channel.CreatorId, sc.Id, model.GetMillis()); err != nil {
mlog.Error("Failed to update ChannelMemberHistory table", mlog.Err(err))
return nil, model.NewAppError("CreateChannel", "app.channel_member_history.log_join_event.internal_error", nil, err.Error(), http.StatusInternalServerError)
}
@@ -417,12 +415,10 @@ func (a *App) createDirectChannel(userId string, otherUserId string) (*model.Cha
}
if err := a.Srv().Store.ChannelMemberHistory().LogJoinEvent(userId, channel.Id, model.GetMillis()); err != nil {
mlog.Error("Failed to update ChannelMemberHistory table", mlog.Err(err))
return nil, model.NewAppError("CreateDirectChannel", "app.channel_member_history.log_join_event.internal_error", nil, err.Error(), http.StatusInternalServerError)
}
if userId != otherUserId {
if err := a.Srv().Store.ChannelMemberHistory().LogJoinEvent(otherUserId, channel.Id, model.GetMillis()); err != nil {
mlog.Error("Failed to update ChannelMemberHistory table", mlog.Err(err))
return nil, model.NewAppError("CreateDirectChannel", "app.channel_member_history.log_join_event.internal_error", nil, err.Error(), http.StatusInternalServerError)
}
}
@@ -554,7 +550,6 @@ func (a *App) createGroupChannel(userIds []string, creatorId string) (*model.Cha
}
}
if err := a.Srv().Store.ChannelMemberHistory().LogJoinEvent(user.Id, channel.Id, model.GetMillis()); err != nil {
mlog.Error("Failed to update ChannelMemberHistory table", mlog.Err(err))
return nil, model.NewAppError("createGroupChannel", "app.channel_member_history.log_join_event.internal_error", nil, err.Error(), http.StatusInternalServerError)
}
}
@@ -1330,13 +1325,11 @@ func (a *App) addUserToChannel(user *model.User, channel *model.Channel, teamMem
newMember, nErr = a.Srv().Store.Channel().SaveMember(newMember)
if nErr != nil {
mlog.Error("Failed to add member", mlog.String("user_id", user.Id), mlog.String("channel_id", channel.Id), mlog.Err(nErr))
return nil, model.NewAppError("AddUserToChannel", "api.channel.add_user.to.channel.failed.app_error", nil, "", http.StatusInternalServerError)
return nil, model.NewAppError("AddUserToChannel", "api.channel.add_user.to.channel.failed.app_error", nil, fmt.Sprintf("failed to add member: user_id: %s, channel_id:%s", user.Id, channel.Id), http.StatusInternalServerError)
}
a.WaitForChannelMembership(channel.Id, user.Id)
if nErr := a.Srv().Store.ChannelMemberHistory().LogJoinEvent(user.Id, channel.Id, model.GetMillis()); nErr != nil {
mlog.Error("Failed to update ChannelMemberHistory table", mlog.Err(nErr))
return nil, model.NewAppError("AddUserToChannel", "app.channel_member_history.log_join_event.internal_error", nil, nErr.Error(), http.StatusInternalServerError)
}

Просмотреть файл

@@ -530,7 +530,7 @@ func (a *App) HandleCommandResponse(command *model.Command, args *model.CommandA
_, err := a.HandleCommandResponsePost(command, args, response, builtIn)
if err != nil {
mlog.Error("error occurred in handling command response post", mlog.Err(err))
mlog.Debug("Error occurred in handling command response post", mlog.Err(err))
lastError = err
}
@@ -539,7 +539,7 @@ func (a *App) HandleCommandResponse(command *model.Command, args *model.CommandA
_, err := a.HandleCommandResponsePost(command, args, resp, builtIn)
if err != nil {
mlog.Error("error occurred in handling command response post", mlog.Err(err))
mlog.Debug("Error occurred in handling command response post", mlog.Err(err))
lastError = err
}
}

Просмотреть файл

@@ -52,8 +52,7 @@ func (a *App) GetLdapGroup(ldapGroupID string) (*model.Group, *model.AppError) {
return nil, err
}
} else {
ae := model.NewAppError("GetLdapGroup", "ent.ldap.app_error", nil, "", http.StatusNotImplemented)
mlog.Error("Unable to use ldap", mlog.String("ldap_group_id", ldapGroupID), mlog.Err(ae))
ae := model.NewAppError("GetLdapGroup", "ent.ldap.app_error", map[string]interface{}{"ldap_group_id": ldapGroupID}, "", http.StatusNotImplemented)
return nil, ae
}
@@ -74,7 +73,6 @@ func (a *App) GetAllLdapGroupsPage(page int, perPage int, opts model.LdapGroupSe
}
} else {
ae := model.NewAppError("GetAllLdapGroupsPage", "ent.ldap.app_error", nil, "", http.StatusNotImplemented)
mlog.Error("Unable to use ldap", mlog.Err(ae))
return nil, 0, ae
}

Просмотреть файл

@@ -69,7 +69,7 @@ func (a *App) AuthenticateUserForLogin(id, loginId, password, mfaToken, cwsToken
}
token, err := a.Srv().Store.Token().GetByToken(cwsToken)
if nfErr := new(store.ErrNotFound); err != nil && !errors.As(err, &nfErr) {
mlog.Error("error retrieving the cws token from the store", mlog.Err(err))
mlog.Debug("Error retrieving the cws token from the store", mlog.Err(err))
return nil, model.NewAppError("AuthenticateUserForLogin",
"api.user.login_by_cws.invalid_token.app_error", nil, "", http.StatusInternalServerError)
}
@@ -87,7 +87,7 @@ func (a *App) AuthenticateUserForLogin(id, loginId, password, mfaToken, cwsToken
}
err := a.Srv().Store.Token().Save(token)
if err != nil {
mlog.Error("error storing the cws token in the store", mlog.Err(err))
mlog.Debug("Error storing the cws token in the store", mlog.Err(err))
return nil, model.NewAppError("AuthenticateUserForLogin",
"api.user.login_by_cws.invalid_token.app_error", nil, "", http.StatusInternalServerError)
}

Просмотреть файл

@@ -422,8 +422,7 @@ func (a *App) SendNotifications(post *model.Post, team *model.Team, channel *mod
if *a.Config().ServiceSettings.CollapsedThreads != model.COLLAPSED_THREADS_DISABLED && post.RootId != "" {
thread, err := a.Srv().Store.Thread().Get(post.RootId)
if err != nil {
mlog.Error("Cannot get thread", mlog.String("id", post.RootId))
return nil, err
return nil, errors.Wrapf(err, "cannot get thread %q", post.RootId)
}
payload := thread.ToJson()
for _, uid := range thread.Participants {

Просмотреть файл

@@ -247,7 +247,6 @@ func (a *App) GetOAuthAccessTokenForImplicitFlow(userId string, authRequest *mod
accessData := &model.AccessData{ClientId: authRequest.ClientId, UserId: user.Id, Token: session.Token, RefreshToken: "", RedirectUri: authRequest.RedirectUri, ExpiresAt: session.ExpiresAt, Scope: authRequest.Scope}
if _, err := a.Srv().Store.OAuth().SaveAccessData(accessData); err != nil {
mlog.Error("error saving oauth access data in implicit flow", mlog.Err(err))
return nil, model.NewAppError("GetOAuthAccessToken", "api.oauth.get_access_token.internal_saving.app_error", nil, "", http.StatusInternalServerError)
}
@@ -327,7 +326,6 @@ func (a *App) GetOAuthAccessTokenForCodeFlow(clientId, grantType, redirectUri, c
accessData = &model.AccessData{ClientId: clientId, UserId: user.Id, Token: session.Token, RefreshToken: model.NewId(), RedirectUri: redirectUri, ExpiresAt: session.ExpiresAt, Scope: authData.Scope}
if _, nErr = a.Srv().Store.OAuth().SaveAccessData(accessData); nErr != nil {
mlog.Error("error saving oauth access data in token for code flow", mlog.Err(nErr))
return nil, model.NewAppError("GetOAuthAccessToken", "api.oauth.get_access_token.internal_saving.app_error", nil, "", http.StatusInternalServerError)
}
@@ -399,7 +397,6 @@ func (a *App) newSessionUpdateToken(appName string, accessData *model.AccessData
accessData.ExpiresAt = session.ExpiresAt
if _, err := a.Srv().Store.OAuth().UpdateAccessData(accessData); err != nil {
mlog.Error("error updating oauth access data", mlog.Err(err))
return nil, model.NewAppError("newSessionUpdateToken", "web.get_access_token.internal_saving.app_error", nil, "", http.StatusInternalServerError)
}
accessRsp := &model.AccessResponse{

Просмотреть файл

@@ -87,7 +87,6 @@ func (a *App) runPluginsHook(info *model.FileInfo, file io.Reader) *model.AppErr
if written > 0 {
info.Size = written
if fileErr := a.MoveFile(tmpPath, info.Path); fileErr != nil {
mlog.Error("Failed to move file", mlog.Err(fileErr))
return model.NewAppError("runPluginsHook", "app.upload.run_plugins_hook.move_fail",
nil, fileErr.Error(), http.StatusInternalServerError)
}

Просмотреть файл

@@ -213,7 +213,7 @@ func (s *Server) IsFirstUserAccount() bool {
if cachedSessions == 0 {
count, err := s.Store.User().Count(model.UserCountOptions{IncludeDeleted: true})
if err != nil {
mlog.Error("There was a error fetching if first user account", mlog.Err(err))
mlog.Debug("There was an error fetching if first user account", mlog.Err(err))
return false
}
if count <= 0 {
@@ -299,7 +299,6 @@ func (a *App) createUser(user *model.User) (*model.User, *model.AppError) {
ruser, nErr := a.Srv().Store.User().Save(user)
if nErr != nil {
mlog.Error("Couldn't save the user", mlog.Err(nErr))
var appErr *model.AppError
var invErr *store.ErrInvalidInput
switch {