From f237afd2accb16d2d6769f8bb224c12405a6c80d Mon Sep 17 00:00:00 2001 From: kolaente Date: Mon, 2 Aug 2021 00:05:13 +0200 Subject: [PATCH] Fix panic on invalid smtp config --- pkg/mail/mail.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/mail/mail.go b/pkg/mail/mail.go index 6f95749a1d..d7a83833eb 100644 --- a/pkg/mail/mail.go +++ b/pkg/mail/mail.go @@ -67,21 +67,24 @@ func StartMailDaemon() { if !open { if s, err = d.Dial(); err != nil { log.Error("Error during connect to smtp server: %s", err) + break } open = true } if err := gomail.Send(s, m); err != nil { log.Error("Error when sending mail: %s", err) + break } // Close the connection to the SMTP server if no email was sent in // the last 30 seconds. case <-time.After(config.MailerQueueTimeout.GetDuration() * time.Second): if open { + open = false if err := s.Close(); err != nil { log.Error("Error closing the mail server connection: %s\n", err) + break } log.Infof("Closed connection to mailserver") - open = false } } }