Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 08:58:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 111

Add wrap for SMTP connection error (#3206)

Browse source
This commit is contained in:
Zach Wasserman 2021-12-09 09:58:33 -08:00 committed by GitHub
parent 10871172f6
commit 32571c0990
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server/mail/mail.go
View file

@ -151,7 +151,7 @@ func (m mailService) sendMail(e fleet.Email, msg []byte) error {
if e.Config.SMTPSettings.SMTPAuthenticationMethod == fleet.AuthMethodNameCramMD5 {
err = smtp.SendMail(smtpHost, auth, e.Config.SMTPSettings.SMTPSenderAddress, e.To, msg)
if err != nil {
return fmt.Errorf("failed to send mail. cramd5 auth method: %w", err)
return fmt.Errorf("failed to send mail. crammd5 auth method: %w", err)
}
return nil
}
@ -235,7 +235,7 @@ func dialTimeout(addr string) (client *smtp.Client, err error) {
_ = conn.SetDeadline(time.Now().Add(28 * time.Second))
client, err = smtp.NewClient(conn, host)
if err != nil {
return nil, errors.New("SMTP connection error")
return nil, fmt.Errorf("SMTP connection error: %w", err)
}
// Clear deadlines
_ = conn.SetDeadline(time.Time{})