ami/tl-vikunja
1
0
Fork 0
Code

fix(mail): do not fail testmail command when the connection could not be closed.

Browse Source 
Resolves https://github.com/go-vikunja/vikunja/issues/300

(cherry picked from commit 40bb86bee59585f827752e96c87e5e8c8f81495c)
This commit is contained in:
kolaente 2024-08-12 11:05:56 +02:00
parent 42ba9240b0
commit 950de7c954
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/cmd/testmail.go
View File

@ -17,6 +17,8 @@
package cmd package cmd
import ( import (
"strings"
"code.vikunja.io/api/pkg/config" "code.vikunja.io/api/pkg/config"
"code.vikunja.io/api/pkg/initialize" "code.vikunja.io/api/pkg/initialize"
"code.vikunja.io/api/pkg/log" "code.vikunja.io/api/pkg/log"
@ -51,10 +53,11 @@ var testmailCmd = &cobra.Command{
opts, err := notifications.RenderMail(message) opts, err := notifications.RenderMail(message)
if err != nil { if err != nil {
log.Errorf("Error sending test mail: %s", err.Error()) log.Errorf("Error rendering test mail: %s", err.Error())
return 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()) log.Errorf("Error sending test mail: %s", err.Error())
return return
} }

4
pkg/mail/send_mail.go
View File

@ -18,6 +18,7 @@ package mail
import ( import (
"embed" "embed"
"fmt"
"io" "io"
"code.vikunja.io/api/pkg/config" "code.vikunja.io/api/pkg/config"
@ -60,8 +61,7 @@ type header struct {
// It works without a queue. // It works without a queue.
func SendTestMail(opts *Opts) error { func SendTestMail(opts *Opts) error {
if config.MailerHost.GetString() == "" { if config.MailerHost.GetString() == "" {
log.Warning("Mailer seems to be not configured! Please see the config docs for more details.") return fmt.Errorf("mailer is not configured! Please see the config docs for more details")
return nil
} }
c, err := getClient() c, err := getClient()