DanielPantle/vikunja
1
0
Fork 0
forked from vikunja/vikunja
Code Pull Requests Activity

chore(mail): update logger to new interface

Browse Source
This commit is contained in:
kolaente 2024-06-18 13:28:10 +02:00 committed by konrad
parent 0799ed4691
commit f222ecfa19
3 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkg/log/mail_logger.go
View File

@ -21,19 +21,19 @@ import (
"time"
"github.com/op/go-logging"
"xorm.io/xorm/log"
"github.com/wneessen/go-mail/log"
)
type MailLogger struct {
logger *logging.Logger
level log.LogLevel
level log.Level
}
const mailFormat = `%{color}%{time:` + time.RFC3339Nano + `}: %{level}` + "\t" + `▶ [MAIL] %{id:03x}%{color:reset} %{message}`
const mailLogModule = `vikunja_mail`
// NewMailLogger creates and initializes a new mail logger
func NewMailLogger(configLogEnabled bool, configLogMail string, configLogMailLevel string) *MailLogger {
func NewMailLogger(configLogEnabled bool, configLogMail string, configLogMailLevel string) log.Logger {
lvl := strings.ToUpper(configLogMailLevel)
level, err := logging.LogLevel(lvl)
if err != nil {
@ -59,33 +59,33 @@ func NewMailLogger(configLogEnabled bool, configLogMail string, configLogMailLev
switch level {
case logging.CRITICAL:
case logging.ERROR:
mailLogger.level = log.LOG_ERR
mailLogger.level = log.LevelError
case logging.WARNING:
mailLogger.level = log.LOG_WARNING
mailLogger.level = log.LevelWarn
case logging.NOTICE:
case logging.INFO:
mailLogger.level = log.LOG_INFO
mailLogger.level = log.LevelInfo
case logging.DEBUG:
mailLogger.level = log.LOG_DEBUG
mailLogger.level = log.LevelDebug
default:
mailLogger.level = log.LOG_OFF
mailLogger.level = 0
}
return mailLogger
}
func (m *MailLogger) Errorf(format string, v ...interface{}) {
m.logger.Errorf(format, v...)
func (m *MailLogger) Debugf(l log.Log) {
m.logger.Debugf(l.Format, l.Messages...)
}
func (m *MailLogger) Warnf(format string, v ...interface{}) {
m.logger.Warningf(format, v...)
func (m *MailLogger) Infof(l log.Log) {
m.logger.Infof(l.Format, l.Messages...)
}
func (m *MailLogger) Infof(format string, v ...interface{}) {
m.logger.Infof(format, v...)
func (m *MailLogger) Warnf(l log.Log) {
m.logger.Warningf(l.Format, l.Messages...)
}
func (m *MailLogger) Debugf(format string, v ...interface{}) {
m.logger.Debugf(format, v...)
func (m *MailLogger) Errorf(l log.Log) {
m.logger.Errorf(l.Format, l.Messages...)
}

4
pkg/mail/mail.go
View File

@ -49,7 +49,7 @@ func getClient() (*mail.Client, error) {
opts := []mail.Option{
mail.WithPort(config.MailerPort.GetInt()),
mail.WithTLSPolicy(tlsPolicy),
mail.WithTLSPortPolicy(tlsPolicy),
mail.WithTLSConfig(&tls.Config{
//#nosec G402
InsecureSkipVerify: config.MailerSkipTLSVerify.GetBool(),
@ -61,7 +61,7 @@ func getClient() (*mail.Client, error) {
}
if config.MailerForceSSL.GetBool() {
opts = append(opts, mail.WithSSL())
opts = append(opts, mail.WithSSLPort(true))
}
if config.MailerUsername.GetString() != "" && config.MailerPassword.GetString() != "" {

5
pkg/mail/send_mail.go
View File

@ -89,7 +89,10 @@ func getMessage(opts *Opts) *mail.Msg {
}
for name, content := range opts.Embeds {
m.EmbedReader(name, content)
err := m.EmbedReader(name, content)
if err != nil {
log.Errorf("Could not create reader to embet into mail: %s", err)
}
}
for name, fs := range opts.EmbedFS {