From ab70e85f1ceddac52d1953941dc06e09b18e245d Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Thu, 22 Jun 2023 10:12:03 +0200 Subject: [PATCH] fix(GODT-2653): Only log when err is not nil --- internal/user/imap.go | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/internal/user/imap.go b/internal/user/imap.go index 2b7c3bd0..2ebb0e14 100644 --- a/internal/user/imap.go +++ b/internal/user/imap.go @@ -353,15 +353,17 @@ func (conn *imapConnector) CreateMessage( } msg, literal, err := conn.importMessage(ctx, literal, wantLabelIDs, wantFlags, unread) - if err != nil && errors.Is(err, proton.ErrImportSizeExceeded) { - // Remap error so that Gluon does not put this message in the recovery mailbox. - err = fmt.Errorf("%v: %w", err, connector.ErrMessageSizeExceedsLimits) - } + if err != nil { + if errors.Is(err, proton.ErrImportSizeExceeded) { + // 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) { - logrus.WithError(apiErr).WithField("Details", apiErr.DetailsToString()).Error("Failed to import message") - } else { - logrus.WithError(err).Error("Failed to import message") + if apiErr := new(proton.APIError); errors.As(err, &apiErr) { + logrus.WithError(apiErr).WithField("Details", apiErr.DetailsToString()).Error("Failed to import message") + } else { + logrus.WithError(err).Error("Failed to import message") + } } return msg, literal, err