From c677b78f16c4a902092f64eb96c62dfc0f7694ef Mon Sep 17 00:00:00 2001 From: James Houlahan Date: Thu, 14 Jan 2021 14:00:41 +0100 Subject: [PATCH] fix: don't log errors caused by empty SELECT --- internal/imap/user.go | 11 ++++++++++- unreleased.md | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/internal/imap/user.go b/internal/imap/user.go index 8c36d9c5..6a3061e9 100644 --- a/internal/imap/user.go +++ b/internal/imap/user.go @@ -136,7 +136,16 @@ func (iu *imapUser) GetMailbox(name string) (mb goIMAPBackend.Mailbox, err error storeMailbox, err := iu.storeAddress.GetMailbox(name) if err != nil { - log.WithField("name", name).WithError(err).Error("Could not get mailbox") + logMsg := log.WithField("name", name).WithError(err) + + // GODT-97: some clients perform SELECT "" in order to unselect. + // We don't want to fill the logs with errors in this case. + if name != "" { + logMsg.Error("Could not get mailbox") + } else { + logMsg.Debug("Failed attempt to get mailbox with empty name") + } + return } diff --git a/unreleased.md b/unreleased.md index cb13df47..0eff2053 100644 --- a/unreleased.md +++ b/unreleased.md @@ -9,6 +9,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/) ### Removed ### Changed +* GODT-97 Don't log errors caused by SELECT "". ### Fixed * GODT-979 Fix panic when trying to parse a multipart/alternative section that has no child sections.