http_(proxy,server): remove Listener

The listener injection is not used and collides with the followup changes.
saucelabs · Sep 11, 2023 · 212cbb6 · 212cbb6
1 parent df50e5f
commit 212cbb6
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 11 deletions.
diff --git a/http_proxy.go b/http_proxy.go
@@ -125,7 +125,6 @@ type HTTPProxy struct {
 	addr      atomic.Pointer[string]
 
 	TLSConfig *tls.Config
-	Listener  net.Listener
 }
 
 func NewHTTPProxy(cfg *HTTPProxyConfig, pr PACResolver, cm *CredentialsMatcher, rt http.RoundTripper, log log.Logger) (*HTTPProxy, error) {
@@ -521,10 +520,6 @@ func (hp *HTTPProxy) Run(ctx context.Context) error {
 }
 
 func (hp *HTTPProxy) listener() (net.Listener, error) {
-	if hp.Listener != nil {
-		return hp.Listener, nil
-	}
-
 	listener, err := net.Listen("tcp", hp.config.Addr)
 	if err != nil {
 		return nil, fmt.Errorf("failed to open listener on address %s: %w", hp.config.Addr, err)

diff --git a/http_server.go b/http_server.go
@@ -109,8 +109,6 @@ type HTTPServer struct {
 	log    log.Logger
 	srv    *http.Server
 	addr   atomic.Pointer[string]
-
-	Listener net.Listener
 }
 
 func NewHTTPServer(cfg *HTTPServerConfig, h http.Handler, log log.Logger) (*HTTPServer, error) {
@@ -234,10 +232,6 @@ func (hs *HTTPServer) Run(ctx context.Context) error {
 }
 
 func (hs *HTTPServer) listener() (net.Listener, error) {
-	if hs.Listener != nil {
-		return hs.Listener, nil
-	}
-
 	switch hs.config.Protocol {
 	case HTTPScheme, HTTPSScheme, HTTP2Scheme:
 		listener, err := net.Listen("tcp", hs.srv.Addr)