From 40bb86bee59585f827752e96c87e5e8c8f81495c Mon Sep 17 00:00:00 2001 From: kolaente Date: Mon, 12 Aug 2024 11:05:56 +0200 Subject: [PATCH] fix(mail): do not fail testmail command when the connection could not be closed. Resolves https://github.com/go-vikunja/vikunja/issues/300 --- pkg/cmd/testmail.go | 7 +++++-- pkg/mail/send_mail.go | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkg/cmd/testmail.go b/pkg/cmd/testmail.go index e8202a741..af5b1e49b 100644 --- a/pkg/cmd/testmail.go +++ b/pkg/cmd/testmail.go @@ -17,6 +17,8 @@ package cmd import ( + "strings" + "code.vikunja.io/api/pkg/config" "code.vikunja.io/api/pkg/initialize" "code.vikunja.io/api/pkg/log" @@ -51,10 +53,11 @@ var testmailCmd = &cobra.Command{ opts, err := notifications.RenderMail(message) if err != nil { - log.Errorf("Error sending test mail: %s", err.Error()) + log.Errorf("Error rendering test mail: %s", err.Error()) return } - if err := mail.SendTestMail(opts); err != nil { + if err := mail.SendTestMail(opts); err != nil && + strings.HasPrefix(err.Error(), "failed to close connction: not connected to SMTP server") { log.Errorf("Error sending test mail: %s", err.Error()) return } diff --git a/pkg/mail/send_mail.go b/pkg/mail/send_mail.go index 6f039934c..168e13bef 100644 --- a/pkg/mail/send_mail.go +++ b/pkg/mail/send_mail.go @@ -18,6 +18,7 @@ package mail import ( "embed" + "fmt" "io" "code.vikunja.io/api/pkg/config" @@ -60,8 +61,7 @@ type header struct { // It works without a queue. func SendTestMail(opts *Opts) error { if config.MailerHost.GetString() == "" { - log.Warning("Mailer seems to be not configured! Please see the config docs for more details.") - return nil + return fmt.Errorf("mailer is not configured! Please see the config docs for more details") } c, err := getClient()