yesBad/proton-bridge
1
0
Fork 0
Code Actions Activity

fix(GODT-2653): Only log when err is not nil

Browse Source
This commit is contained in:
Leander Beernaert
2023-06-22 10:12:03 +02:00
parent ff57eb2b43
commit ab70e85f1c
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
internal/user/imap.go
View File

@ -353,15 +353,17 @@ func (conn *imapConnector) CreateMessage(
} }
msg, literal, err := conn.importMessage(ctx, literal, wantLabelIDs, wantFlags, unread) msg, literal, err := conn.importMessage(ctx, literal, wantLabelIDs, wantFlags, unread)
if err != nil && errors.Is(err, proton.ErrImportSizeExceeded) { if err != nil {
// Remap error so that Gluon does not put this message in the recovery mailbox. if errors.Is(err, proton.ErrImportSizeExceeded) {
err = fmt.Errorf("%v: %w", err, connector.ErrMessageSizeExceedsLimits) // Remap error so that Gluon does not put this message in the recovery mailbox.
} err = fmt.Errorf("%v: %w", err, connector.ErrMessageSizeExceedsLimits)
}
if apiErr := new(proton.APIError); errors.As(err, &apiErr) { if apiErr := new(proton.APIError); errors.As(err, &apiErr) {
logrus.WithError(apiErr).WithField("Details", apiErr.DetailsToString()).Error("Failed to import message") logrus.WithError(apiErr).WithField("Details", apiErr.DetailsToString()).Error("Failed to import message")
} else { } else {
logrus.WithError(err).Error("Failed to import message") logrus.WithError(err).Error("Failed to import message")
}
} }
return msg, literal, err return msg, literal, err