Browse Source

Improve logging for received emails

Bernhard Froehlich 6 years ago
parent
commit
66fb86be7a
1 changed files with 9 additions and 0 deletions
  1. 9 0
      main.go

+ 9 - 0
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,