From f5617ced3fb65ef1a18bf2b4238baca89b788fcd Mon Sep 17 00:00:00 2001 From: James Houlahan Date: Mon, 17 Aug 2020 10:49:56 +0200 Subject: [PATCH] fix (GODT-597): duplicate send when draft creation takes a long time --- internal/smtp/user.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/smtp/user.go b/internal/smtp/user.go index b2a79268..f0f55917 100644 --- a/internal/smtp/user.go +++ b/internal/smtp/user.go @@ -234,9 +234,11 @@ func (su *smtpUser) Send(from string, to []string, messageReader io.Reader) (err message, atts, err := su.storeUser.CreateDraft(kr, message, attReaders, attachedPublicKey, attachedPublicKeyName, parentID) if err != nil { su.backend.sendRecorder.removeMessage(sendRecorderMessageHash) - return + log.WithError(err).Error("Draft could not be created") + return err } su.backend.sendRecorder.setMessageID(sendRecorderMessageHash, message.ID) + log.WithField("messageID", message.ID).Debug("Draft was created successfully") // We always have to create a new draft even if there already is one, // because clients don't necessarily save the draft before sending, which