From ac60ed62ae7192a44d185cd7044125b4609c45fd Mon Sep 17 00:00:00 2001 From: Ralph Slooten Date: Sat, 17 Aug 2024 14:38:04 +1200 Subject: [PATCH] Update smtpd logging format --- server/smtpd/smtpd.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/server/smtpd/smtpd.go b/server/smtpd/smtpd.go index ba7d8d5..711cc43 100644 --- a/server/smtpd/smtpd.go +++ b/server/smtpd/smtpd.go @@ -212,13 +212,13 @@ func Listen() error { return listenAndServe(config.SMTPListen, mailHandler, authHandler) } -// Translate the smtpd verb from READ/WRITE to from/to +// Translate the smtpd verb from READ/WRITE func verbLogTranslator(verb string) string { if verb == "READ" { - return "from" + return "received" } - return "to" + return "response" } func listenAndServe(addr string, handler smtpd.MsgIDHandler, authHandler smtpd.AuthHandler) error { @@ -234,13 +234,13 @@ func listenAndServe(addr string, handler smtpd.MsgIDHandler, authHandler smtpd.A MaxRecipients: config.SMTPMaxRecipients, DisableReverseDNS: DisableReverseDNS, LogRead: func(remoteIP, verb, line string) { - logger.Log().Debugf("[smtpd] %s %s: %s", verbLogTranslator(verb), remoteIP, line) + logger.Log().Debugf("[smtpd] %s (%s) %s", verbLogTranslator(verb), remoteIP, line) }, LogWrite: func(remoteIP, verb, line string) { if errorResponse.MatchString(line) { - logger.Log().Warnf("[smtpd] %s %s: %s", verbLogTranslator(verb), remoteIP, line) + logger.Log().Warnf("[smtpd] %s (%s) %s", verbLogTranslator(verb), remoteIP, line) } else { - logger.Log().Debugf("[smtpd] %s %s: %s", verbLogTranslator(verb), remoteIP, line) + logger.Log().Debugf("[smtpd] %s (%s) %s", verbLogTranslator(verb), remoteIP, line) } }, }