Merge branch 'release/v1.2.7' into devel

This commit is contained in:
Jakub
2020-04-27 15:54:02 +02:00
5 changed files with 21 additions and 8 deletions

View File

@ -38,8 +38,8 @@ const Capability = "UIDPLUS"
const (
copyuid = "COPYUID"
appenduid = "APPENDUID"
copySuccess = "COPY successful"
appendSucess = "APPEND successful"
copySuccess = "COPY completed"
appendSucess = "APPEND completed"
)
var log = logrus.WithField("pkg", "imap/uidplus") //nolint[gochecknoglobals]

View File

@ -437,7 +437,7 @@ func (loop *eventLoop) processMessages(eventLog *logrus.Entry, messages []*pmapi
msgLog.WithError(err).Warning("Message was not present in DB. Trying fetch...")
if msg, err = loop.client().GetMessage(message.ID); err != nil {
if err == pmapi.ErrNoSuchAPIID {
if _, ok := err.(*pmapi.ErrUnprocessableEntity); ok {
msgLog.WithError(err).Warn("Skipping message update because message exists neither in local DB nor on API")
err = nil
continue