synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-18 14:17:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: restore closing SMTP message on method exit (#14496)

Browse Source
This commit is contained in:
Danny Kopping
2024-08-30 13:03:25 +02:00
committed by GitHub
parent a74273f1fd
commit 0f414a00d3
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
coderd/notifications/dispatch/smtp.go
View File

@ -183,6 +183,15 @@ func (s *SMTPHandler) dispatch(subject, htmlBody, plainBody, to string) Delivery
if err != nil { if err != nil {
return true, xerrors.Errorf("message transmission: %w", err) return true, xerrors.Errorf("message transmission: %w", err)
} }
closeOnce := sync.OnceValue(func() error {
return message.Close()
})
// Close the message when this method exits in order to not leak resources. Even though we're calling this explicitly
// further down, the method may exit before then.
defer func() {
// If we try close an already-closed writer, it'll send a subsequent request to the server which is invalid.
_ = closeOnce()
}()
// Create message headers. // Create message headers.
msg := &bytes.Buffer{} msg := &bytes.Buffer{}
@ -250,7 +259,7 @@ func (s *SMTPHandler) dispatch(subject, htmlBody, plainBody, to string) Delivery
return false, xerrors.Errorf("write body buffer: %w", err) return false, xerrors.Errorf("write body buffer: %w", err)
} }
if err = message.Close(); err != nil { if err = closeOnce(); err != nil {
return true, xerrors.Errorf("delivery failure: %w", err) return true, xerrors.Errorf("delivery failure: %w", err)
} }