|
|
@@ -14,6 +14,12 @@
|
|
|
|
|
|
package logger
|
|
|
|
|
|
+import (
|
|
|
+ "fmt"
|
|
|
+
|
|
|
+ "github.com/wneessen/go-mail/log"
|
|
|
+)
|
|
|
+
|
|
|
const (
|
|
|
mailLogSender = "smtpclient"
|
|
|
)
|
|
|
@@ -24,25 +30,37 @@ type MailAdapter struct {
|
|
|
}
|
|
|
|
|
|
// Errorf emits a log at Error level
|
|
|
-func (l *MailAdapter) Errorf(format string, v ...any) {
|
|
|
- ErrorToConsole(format, v...)
|
|
|
- Log(LevelError, mailLogSender, l.ConnectionID, format, v...)
|
|
|
+func (l *MailAdapter) Errorf(logMsg log.Log) {
|
|
|
+ format := l.getFormatString(&logMsg)
|
|
|
+ ErrorToConsole(format, logMsg.Messages...)
|
|
|
+ Log(LevelError, mailLogSender, l.ConnectionID, format, logMsg.Messages...)
|
|
|
}
|
|
|
|
|
|
// Warnf emits a log at Warn level
|
|
|
-func (l *MailAdapter) Warnf(format string, v ...any) {
|
|
|
- WarnToConsole(format, v...)
|
|
|
- Log(LevelWarn, mailLogSender, l.ConnectionID, format, v...)
|
|
|
+func (l *MailAdapter) Warnf(logMsg log.Log) {
|
|
|
+ format := l.getFormatString(&logMsg)
|
|
|
+ WarnToConsole(format, logMsg.Messages...)
|
|
|
+ Log(LevelWarn, mailLogSender, l.ConnectionID, format, logMsg.Messages...)
|
|
|
}
|
|
|
|
|
|
// Infof emits a log at Info level
|
|
|
-func (l *MailAdapter) Infof(format string, v ...any) {
|
|
|
- InfoToConsole(format, v...)
|
|
|
- Log(LevelInfo, mailLogSender, l.ConnectionID, format, v...)
|
|
|
+func (l *MailAdapter) Infof(logMsg log.Log) {
|
|
|
+ format := l.getFormatString(&logMsg)
|
|
|
+ InfoToConsole(format, logMsg.Messages...)
|
|
|
+ Log(LevelInfo, mailLogSender, l.ConnectionID, format, logMsg.Messages...)
|
|
|
}
|
|
|
|
|
|
// Debugf emits a log at Debug level
|
|
|
-func (l *MailAdapter) Debugf(format string, v ...any) {
|
|
|
- DebugToConsole(format, v...)
|
|
|
- Log(LevelDebug, mailLogSender, l.ConnectionID, format, v...)
|
|
|
+func (l *MailAdapter) Debugf(logMsg log.Log) {
|
|
|
+ format := l.getFormatString(&logMsg)
|
|
|
+ DebugToConsole(format, logMsg.Messages...)
|
|
|
+ Log(LevelDebug, mailLogSender, l.ConnectionID, format, logMsg.Messages...)
|
|
|
+}
|
|
|
+
|
|
|
+func (*MailAdapter) getFormatString(logMsg *log.Log) string {
|
|
|
+ p := "C <-- S:"
|
|
|
+ if logMsg.Direction == log.DirClientToServer {
|
|
|
+ p = "C --> S:"
|
|
|
+ }
|
|
|
+ return fmt.Sprintf("%s %s", p, logMsg.Format)
|
|
|
}
|
Nicola Murino