refactor common pattern of close & remove temporary file into calling the new store.CloseRemoveTempFile

This commit is contained in:
Mechiel Lukkien
2023-11-01 18:57:38 +01:00
parent b6897d1837
commit ef50f4abf0
11 changed files with 15 additions and 81 deletions

View File

@ -175,13 +175,7 @@ func deliverDSN(log *mlog.Log, m Msg, remoteMTA dsn.NameIP, secodeOpt, errmsg st
qlog("creating temporary message file", err)
return
}
defer func() {
name := msgFile.Name()
err := msgFile.Close()
log.Check(err, "closing message file")
err = os.Remove(name)
log.Check(err, "removing message file", mlog.Field("path", name))
}()
defer store.CloseRemoveTempFile(log, msgFile, "dsn message")
msgWriter := message.NewWriter(msgFile)
if _, err := msgWriter.Write(msgData); err != nil {