infrastructure/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-07-12 13:04:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
smtpserver/server.go
View File

@ -1532,13 +1532,7 @@ func (c *conn) cmdData(p *parser) {
if err != nil {
xsmtpServerErrorf(errCodes(smtp.C451LocalErr, smtp.SeSys3Other0, err), "creating temporary file for message: %s", err)
}
defer func() {
name := dataFile.Name()
err := dataFile.Close()
c.log.Check(err, "removing temporary message file")
err = os.Remove(name)
c.log.Check(err, "removing temporary message file", mlog.Field("path", name))
}()
defer store.CloseRemoveTempFile(c.log, dataFile, "smtpserver delivered message")
msgWriter := message.NewWriter(dataFile)
dr := smtp.NewDataReader(c.r)
n, err := io.Copy(&limitWriter{maxSize: c.maxMessageSize, w: msgWriter}, dr)