From b4adc35cace7d7d99a26ef84cc5ebd00b2c7df07 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Mon, 28 Aug 2017 00:03:12 +0100 Subject: [PATCH] Fix issue where PORT env could override --port argument --- main.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index c177e5f..e210d34 100644 --- a/main.go +++ b/main.go @@ -17,7 +17,7 @@ var defaultPort = "8080" var ( port = kingpin.Flag("port", "Port to listen to.").Short('p'). - Default(defaultPort).String() + Default("").String() bind = kingpin.Flag("bind", "Bind address.").Short('b'). Default("0.0.0.0").String() version = kingpin.Flag("version", "Print version info."). @@ -59,10 +59,12 @@ func startServer() { server := fasthttp.Server{Handler: r.HandleRequest} - if *port == defaultPort { + if *port == "" { envPort := os.Getenv("PORT") if envPort != "" { *port = envPort + } else { + *port = defaultPort } }