fix (GODT-597): duplicate send when draft creation takes a long time

This commit is contained in:
James Houlahan
2020-08-17 10:49:56 +02:00
parent 35b37c7097
commit f5617ced3f

View File

@ -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) message, atts, err := su.storeUser.CreateDraft(kr, message, attReaders, attachedPublicKey, attachedPublicKeyName, parentID)
if err != nil { if err != nil {
su.backend.sendRecorder.removeMessage(sendRecorderMessageHash) su.backend.sendRecorder.removeMessage(sendRecorderMessageHash)
return log.WithError(err).Error("Draft could not be created")
return err
} }
su.backend.sendRecorder.setMessageID(sendRecorderMessageHash, message.ID) 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, // 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 // because clients don't necessarily save the draft before sending, which