Merge pull request #47 from Valentin-Kaiser/email

valentin-kaiser · web-flow · commit df6602c33dc9 · 2025-09-16T09:24:25.000+02:00
removed duplicate SMTP connection close
diff --git a/mail/internal/email/email.go b/mail/internal/email/email.go
@@ -377,7 +377,6 @@ func (e *Email) Send(address string, auth smtp.Auth, helo string) error {
 	if err != nil {
 		return apperror.NewError("could not dial SMTP connection").AddError(err)
 	}
-	defer apperror.Catch(conn.Close, "could not close SMTP connection")
 
 	// Send custom HELO
 	err = conn.Hello(helo)
@@ -531,7 +530,6 @@ func (e *Email) SendWithStartTLS(address string, auth smtp.Auth, config *tls.Con
 	if err != nil {
 		return apperror.NewError("could not dial SMTP connection").AddError(err)
 	}
-	defer apperror.Catch(conn.Close, "could not close SMTP connection")
 
 	// Send custom HELO if provided (before STARTTLS)
 	if helo != "" {

Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,6 @@ func (e *Email) Send(address string, auth smtp.Auth, helo string) error {`
`377`	`377`	`if err != nil {`
`378`	`378`	`return apperror.NewError("could not dial SMTP connection").AddError(err)`
`379`	`379`	`}`
`380`		`- defer apperror.Catch(conn.Close, "could not close SMTP connection")`
`381`	`380`
`382`	`381`	`// Send custom HELO`
`383`	`382`	`err = conn.Hello(helo)`
`@@ -531,7 +530,6 @@ func (e Email) SendWithStartTLS(address string, auth smtp.Auth, config tls.Con`
`531`	`530`	`if err != nil {`
`532`	`531`	`return apperror.NewError("could not dial SMTP connection").AddError(err)`
`533`	`532`	`}`
`534`		`- defer apperror.Catch(conn.Close, "could not close SMTP connection")`
`535`	`533`
`536`	`534`	`// Send custom HELO if provided (before STARTTLS)`
`537`	`535`	`if helo != "" {`