From ef3fe0db5b31b0488518de5992ebd787a1212604 Mon Sep 17 00:00:00 2001 From: rikimaru0345 Date: Fri, 27 Nov 2020 17:06:29 +0100 Subject: [PATCH] add "server.http.listen-address" flag and "listenAddress" yaml config entry ( https://github.com/cloudhut/kowl/issues/150 ) --- rest/config.go | 2 ++ rest/server.go | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/rest/config.go b/rest/config.go index f7d6cd5..7820bd7 100644 --- a/rest/config.go +++ b/rest/config.go @@ -11,6 +11,7 @@ import ( type Config struct { ServerGracefulShutdownTimeout time.Duration `yaml:"gracefulShutdownTimeout"` + HTTPListenAddress string `yaml:"listenAddress"` HTTPListenPort int `yaml:"listenPort"` HTTPServerReadTimeout time.Duration `yaml:"readTimeout"` HTTPServerWriteTimeout time.Duration `yaml:"writeTimeout"` @@ -27,6 +28,7 @@ type Config struct { func (c *Config) RegisterFlags(f *flag.FlagSet) { f.DurationVar(&c.ServerGracefulShutdownTimeout, "server.graceful-shutdown-timeout", 30*time.Second, "Timeout for graceful shutdowns") + f.StringVar(&c.HTTPListenAddress, "server.http.listen-address", "", "HTTP server listen address") f.IntVar(&c.HTTPListenPort, "server.http.listen-port", 8080, "HTTP server listen port") // Get "PORT" environment variable because CloudRun tells us what Port to use portEnv := os.Getenv("PORT") diff --git a/rest/server.go b/rest/server.go index 122a996..d147394 100644 --- a/rest/server.go +++ b/rest/server.go @@ -65,7 +65,7 @@ func (s *Server) Start() error { }() // Serve HTTP server - listener, err := net.Listen("tcp", net.JoinHostPort("", strconv.Itoa(s.cfg.HTTPListenPort))) + listener, err := net.Listen("tcp", net.JoinHostPort(s.cfg.HTTPListenAddress, strconv.Itoa(s.cfg.HTTPListenPort))) if err != nil { return err }