drew/smtprelay
1
0
Fork 1
mirror of https://github.com/decke/smtprelay.git synced 2025-12-26 15:52:28 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Bernhard Froehlich
2022-05-23 15:07:21 +00:00
parent 44560c9a0c
commit e3ba45ede2
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config.go
View File

@@ -4,6 +4,7 @@ import (
"flag" "flag"
"fmt" "fmt"
"net" "net"
"os"
"regexp" "regexp"
"strings" "strings"
"time" "time"
@@ -188,6 +189,11 @@ func ConfigLoad() {
// Set up logging as soon as possible // Set up logging as soon as possible
setupLogger() setupLogger()
if *versionInfo {
fmt.Printf("smtprelay/%s (%s)\n", appVersion, buildTime)
os.Exit(0)
}
if *remotesStr == "" && *command == "" { if *remotesStr == "" && *command == "" {
log.Warn("no remotes or command set; mail will not be forwarded!") log.Warn("no remotes or command set; mail will not be forwarded!")
} }

6
main.go
View File

@@ -3,7 +3,6 @@ package main
import ( import (
"bytes" "bytes"
"crypto/tls" "crypto/tls"
"fmt"
"net" "net"
"net/textproto" "net/textproto"
"os" "os"
@@ -282,11 +281,6 @@ func getTLSConfig() *tls.Config {
func main() { func main() {
ConfigLoad() ConfigLoad()
if *versionInfo {
fmt.Printf("smtprelay/%s (%s)\n", appVersion, buildTime)
os.Exit(0)
}
log.WithField("version", appVersion). log.WithField("version", appVersion).
Debug("starting smtprelay") Debug("starting smtprelay")