From 3b6afdf80cf72f8eee7bb4ade883e8ca8e54a071 Mon Sep 17 00:00:00 2001 From: Emile Vauge Date: Thu, 7 Sep 2017 20:14:03 +0200 Subject: [PATCH] Fix error in prepareServer --- server/server.go | 1 + server/server_test.go | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/server/server.go b/server/server.go index 0cc19e053..0f5379d34 100644 --- a/server/server.go +++ b/server/server.go @@ -647,6 +647,7 @@ func (server *Server) prepareServer(entryPointName string, entryPoint *configura listener, err := net.Listen("tcp", entryPoint.Address) if err != nil { log.Error("Error opening listener ", err) + return nil, nil, err } if entryPoint.ProxyProtocol { diff --git a/server/server_test.go b/server/server_test.go index 876837b3b..8d47c7831 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -96,7 +96,7 @@ func TestPrepareServerTimeouts(t *testing.T) { t.Parallel() entryPointName := "http" - entryPoint := &configuration.EntryPoint{Address: "localhost:8080"} + entryPoint := &configuration.EntryPoint{Address: "localhost:0"} router := middlewares.NewHandlerSwitcher(mux.NewRouter()) srv := NewServer(test.globalConfig) @@ -504,14 +504,14 @@ func TestServerEntrypointWhitelistConfig(t *testing.T) { { desc: "no whitelist middleware if no config on entrypoint", entrypoint: &configuration.EntryPoint{ - Address: ":8080", + Address: ":0", }, wantMiddleware: false, }, { desc: "whitelist middleware should be added if configured on entrypoint", entrypoint: &configuration.EntryPoint{ - Address: ":8080", + Address: ":0", WhitelistSourceRange: []string{ "127.0.0.1/32", },