From 66fb86be7a2fdd6101e076ed335fe4eb66c4f961 Mon Sep 17 00:00:00 2001
From: Bernhard Froehlich <decke@bluelife.at>
Date: Thu, 20 Dec 2018 14:16:39 +0000
Subject: [PATCH] Improve logging for received emails

---
 main.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/main.go b/main.go
index c937485..1facf90 100644
--- a/main.go
+++ b/main.go
@@ -114,6 +114,13 @@ func authChecker(peer smtpd.Peer, username string, password string) error {
 }
 
 func mailHandler(peer smtpd.Peer, env smtpd.Envelope) error {
+	peerIP := ""
+	if addr, ok := peer.Addr.(*net.TCPAddr); ok {
+		peerIP = addr.IP.String()
+	}
+
+	log.Printf("new mail from=<%s> to=%s peer=[%s]\n", env.Sender,
+		env.Recipients, peerIP)
 
 	var auth smtp.Auth
 	host, _, _ := net.SplitHostPort(*remoteHost)
@@ -124,6 +131,8 @@ func mailHandler(peer smtpd.Peer, env smtpd.Envelope) error {
 
 	env.AddReceivedLine(peer)
 
+	log.Printf("delivering using smarthost %s\n", *remoteHost)
+
 	return smtp.SendMail(
 		*remoteHost,
 		auth,