diff --git a/config.go b/config.go index 9623c89..1035378 100644 --- a/config.go +++ b/config.go @@ -4,6 +4,7 @@ import ( "flag" "fmt" "net" + "os" "regexp" "strings" "time" @@ -188,6 +189,11 @@ func ConfigLoad() { // Set up logging as soon as possible setupLogger() + if *versionInfo { + fmt.Printf("smtprelay/%s (%s)\n", appVersion, buildTime) + os.Exit(0) + } + if *remotesStr == "" && *command == "" { log.Warn("no remotes or command set; mail will not be forwarded!") } diff --git a/main.go b/main.go index 9c409f6..24ed1db 100644 --- a/main.go +++ b/main.go @@ -3,7 +3,6 @@ package main import ( "bytes" "crypto/tls" - "fmt" "net" "net/textproto" "os" @@ -282,11 +281,6 @@ func getTLSConfig() *tls.Config { func main() { ConfigLoad() - if *versionInfo { - fmt.Printf("smtprelay/%s (%s)\n", appVersion, buildTime) - os.Exit(0) - } - log.WithField("version", appVersion). Debug("starting smtprelay")