From 235798581af961f32ad3e5b2957199df96677ea0 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Wed, 1 Sep 2021 12:18:59 +0000 Subject: [PATCH] Allow blank network in server.New There are a lot of tests which create a `server.Config{}` and don't populate the network fields; allow this by setting `DefaultNetwork` if blank. Also pick up a bugfix where `HTTPListenNetwork` was used for gRPC. Signed-off-by: Bryan Boreham --- server/server.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/server/server.go b/server/server.go index c3d3ce16..ee6cafee 100644 --- a/server/server.go +++ b/server/server.go @@ -171,8 +171,12 @@ func New(cfg Config) (*Server, error) { }, []string{"protocol"}) prometheus.MustRegister(tcpConnections) + network := cfg.HTTPListenNetwork + if network == "" { + network = DefaultNetwork + } // Setup listeners first, so we can fail early if the port is in use. - httpListener, err := net.Listen(cfg.HTTPListenNetwork, fmt.Sprintf("%s:%d", cfg.HTTPListenAddress, cfg.HTTPListenPort)) + httpListener, err := net.Listen(network, fmt.Sprintf("%s:%d", cfg.HTTPListenAddress, cfg.HTTPListenPort)) if err != nil { return nil, err } @@ -182,7 +186,11 @@ func New(cfg Config) (*Server, error) { httpListener = netutil.LimitListener(httpListener, cfg.HTTPConnLimit) } - grpcListener, err := net.Listen(cfg.HTTPListenNetwork, fmt.Sprintf("%s:%d", cfg.GRPCListenAddress, cfg.GRPCListenPort)) + network = cfg.GRPCListenNetwork + if network == "" { + network = DefaultNetwork + } + grpcListener, err := net.Listen(network, fmt.Sprintf("%s:%d", cfg.GRPCListenAddress, cfg.GRPCListenPort)) if err != nil { return nil, err }