Browse Source

Fix output for "-version" to not contain unneccessary noise

Bernhard Froehlich 3 years ago
parent
commit
e3ba45ede2
2 changed files with 6 additions and 6 deletions
  1. 6 0
      config.go
  2. 0 6
      main.go

+ 6 - 0
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!")
 	}

+ 0 - 6
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")