Improve logging and make sure smtpd is also logging

This commit is contained in:
Bernhard Froehlich
2018-12-20 09:44:41 +00:00
parent 88d85458dc
commit 3b643b3927

10
main.go
View File

@@ -52,14 +52,17 @@ func main() {
iniflags.Parse() iniflags.Parse()
logwriter := io.Writer(os.Stdout)
if *logFile != "" { if *logFile != "" {
f, err := os.OpenFile(*logFile, os.O_RDWR | os.O_CREATE | os.O_APPEND, 0600) f, err := os.OpenFile(*logFile, os.O_WRONLY | os.O_CREATE | os.O_APPEND, 0600)
if err != nil { if err != nil {
log.Fatalf("Error opening logfile: %v", err) log.Fatalf("Error opening logfile: %v", err)
} }
defer f.Close() defer f.Close()
wrt := io.MultiWriter(os.Stdout, f)
log.SetOutput(wrt) logwriter = io.MultiWriter(os.Stdout, f)
log.SetOutput(logwriter)
} }
listeners := strings.Split(*listen, " ") listeners := strings.Split(*listen, " ")
@@ -71,6 +74,7 @@ func main() {
Hostname: *hostName, Hostname: *hostName,
WelcomeMessage: *welcomeMsg, WelcomeMessage: *welcomeMsg,
Handler: handler, Handler: handler,
ProtocolLogger: log.New(logwriter, "INBOUND: ", log.Lshortfile),
} }
if strings.Index(listeners[i], "://") == -1 { if strings.Index(listeners[i], "://") == -1 {