From 136ef58820b8e2d27ad0ca50bdd9adabd8e4a95d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20Keresztury?= Date: Sun, 7 Jul 2024 15:00:19 +0000 Subject: [PATCH] fix: reorder mail options (#2533) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR fixes a bug where setting the SMTP port didn't have any effect, since it is overridden when `NewClient()` executes the `WithTLSPortPolicy()` option. Reviewed-on: https://kolaente.dev/vikunja/vikunja/pulls/2533 Resolves https://kolaente.dev/vikunja/vikunja/issues/2534 Co-authored-by: Balázs Keresztury Co-committed-by: Balázs Keresztury --- pkg/mail/mail.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/mail/mail.go b/pkg/mail/mail.go index eefe8f24a..f4464e353 100644 --- a/pkg/mail/mail.go +++ b/pkg/mail/mail.go @@ -48,13 +48,13 @@ func getClient() (*mail.Client, error) { } opts := []mail.Option{ - mail.WithPort(config.MailerPort.GetInt()), mail.WithTLSPortPolicy(tlsPolicy), mail.WithTLSConfig(&tls.Config{ //#nosec G402 InsecureSkipVerify: config.MailerSkipTLSVerify.GetBool(), ServerName: config.MailerHost.GetString(), }), + mail.WithPort(config.MailerPort.GetInt()), mail.WithTimeout((config.MailerQueueTimeout.GetDuration() + 3) * time.Second), // 3s more for us to close before mail server timeout mail.WithLogger(log.NewMailLogger(config.LogEnabled.GetBool(), config.LogMail.GetString(), config.LogMailLevel.GetString())), mail.WithDebugLog(),