Fix issue where PORT env could override --port argument

This commit is contained in:
2017-08-28 00:03:12 +01:00
parent 2937ad2b9a
commit b4adc35cac

View File

@@ -17,7 +17,7 @@ var defaultPort = "8080"
var ( var (
port = kingpin.Flag("port", "Port to listen to.").Short('p'). port = kingpin.Flag("port", "Port to listen to.").Short('p').
Default(defaultPort).String() Default("").String()
bind = kingpin.Flag("bind", "Bind address.").Short('b'). bind = kingpin.Flag("bind", "Bind address.").Short('b').
Default("0.0.0.0").String() Default("0.0.0.0").String()
version = kingpin.Flag("version", "Print version info."). version = kingpin.Flag("version", "Print version info.").
@@ -59,10 +59,12 @@ func startServer() {
server := fasthttp.Server{Handler: r.HandleRequest} server := fasthttp.Server{Handler: r.HandleRequest}
if *port == defaultPort { if *port == "" {
envPort := os.Getenv("PORT") envPort := os.Getenv("PORT")
if envPort != "" { if envPort != "" {
*port = envPort *port = envPort
} else {
*port = defaultPort
} }
} }