F5KCK
/
hugo-mx-gateway
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3 from ccamel/fix/fix-writer-close 

Fix potential closing issues
This commit is contained in:
Rodrigue Chakode 2020-06-16 21:57:43 +02:00 committed by GitHub
parent 6ab65d88e5 c58be715bd
commit 15d6735778
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sendmail.go
View File

@ -91,6 +91,7 @@ func (m *SendMailRequest) Execute() error {
if err != nil { if err != nil {
return fmt.Errorf("failed initiating smtp connection (%s)", err) return fmt.Errorf("failed initiating smtp connection (%s)", err)
} }
defer conn.Close()
smtpClient, err := smtp.NewClient(conn, smtpServerHost) smtpClient, err := smtp.NewClient(conn, smtpServerHost)
if err != nil { if err != nil {
@ -120,17 +121,13 @@ func (m *SendMailRequest) Execute() error {
if err != nil { if err != nil {
return fmt.Errorf("failed issuing DATA command (%s)", err) return fmt.Errorf("failed issuing DATA command (%s)", err)
} }
defer smtpWriter.Close()
_, err = smtpWriter.Write([]byte(msg)) _, err = smtpWriter.Write([]byte(msg))
if err != nil { if err != nil {
return fmt.Errorf("failed sending mail content (%s)", err) return fmt.Errorf("failed sending mail content (%s)", err)
} }
err = smtpWriter.Close()
if err != nil {
return fmt.Errorf("failed close smtp client (%s)", err)
}
return nil return nil
} }