infrastructure/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-06-28 05:08:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup message file when DeliverMailbox fails.

Browse Source 
Part of larger changes.
This commit is contained in:
Mechiel Lukkien 2025-03-01 11:07:05 +01:00
parent 5ba51adb14
commit ea64936a67
No known key found for this signature in database
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
store/account.go
View File

@ -2264,8 +2264,18 @@ func (a *Account) DeliverDestination(log mlog.Log, dest config.Destination, m *M
// Caller must hold account wlock (mailbox may be created). // Caller must hold account wlock (mailbox may be created).
// Message delivery, possible mailbox creation, and updated mailbox counts are // Message delivery, possible mailbox creation, and updated mailbox counts are
// broadcasted. // broadcasted.
func (a *Account) DeliverMailbox(log mlog.Log, mailbox string, m *Message, msgFile *os.File) error { func (a *Account) DeliverMailbox(log mlog.Log, mailbox string, m *Message, msgFile *os.File) (rerr error) {
var changes []Change var changes []Change
var commit bool
defer func() {
if !commit && m.ID != 0 {
p := a.MessagePath(m.ID)
err := os.Remove(p)
log.Check(err, "remove delivered message file", slog.String("path", p))
}
}()
err := a.DB.Write(context.TODO(), func(tx *bstore.Tx) error { err := a.DB.Write(context.TODO(), func(tx *bstore.Tx) error {
if ok, _, err := a.CanAddMessageSize(tx, m.Size); err != nil { if ok, _, err := a.CanAddMessageSize(tx, m.Size); err != nil {
return err return err
@ -2300,11 +2310,10 @@ func (a *Account) DeliverMailbox(log mlog.Log, mailbox string, m *Message, msgFi
changes = append(changes, m.ChangeAddUID(), mb.ChangeCounts()) changes = append(changes, m.ChangeAddUID(), mb.ChangeCounts())
return nil return nil
}) })
// todo: if rename succeeded but transaction failed, we should remove the file.
if err != nil { if err != nil {
return err return err
} }
commit = true
BroadcastChanges(a, changes) BroadcastChanges(a, changes)
return nil return nil
} }