Clean up listenAndServe functions by turning them into methods

1 files changed, 4 insertions, 18 deletions

diff --git a/app.go b/app.go
index 3b469b2d..048c2116 100644
--- a/app.go
+++ b/app.go
@@ -421,8 +421,7 @@ func (a *theApp) listenHTTPFD(wg *sync.WaitGroup, fd uintptr, httpHandler http.H
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
-		err := listenAndServe(fd, httpHandler, a.config.General.HTTP2, nil, limiter, false)
-		if err != nil {
+		if err := a.listenAndServe(fd, httpHandler, limiter, listenerConfig{}); err != nil {
 			capturingFatal(err, errortracking.WithField("listener", request.SchemeHTTP))
 		}
 	}()
@@ -432,13 +431,7 @@ func (a *theApp) listenHTTPSFD(wg *sync.WaitGroup, fd uintptr, httpHandler http.
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
-		tlsConfig, err := a.TLSConfig()
-		if err != nil {
-			capturingFatal(err, errortracking.WithField("listener", request.SchemeHTTPS))
-		}
-
-		err = listenAndServe(fd, httpHandler, a.config.General.HTTP2, tlsConfig, limiter, false)
-		if err != nil {
+		if err := a.listenAndServe(fd, httpHandler, limiter, listenerConfig{isTLS: true}); err != nil {
 			capturingFatal(err, errortracking.WithField("listener", request.SchemeHTTPS))
 		}
 	}()
@@ -450,8 +443,7 @@ func (a *theApp) listenProxyFD(wg *sync.WaitGroup, fd uintptr, proxyHandler http
 		wg.Add(1)
 		go func(fd uintptr) {
 			defer wg.Done()
-			err := listenAndServe(fd, proxyHandler, a.config.General.HTTP2, nil, limiter, false)
-			if err != nil {
+			if err := a.listenAndServe(fd, proxyHandler, limiter, listenerConfig{}); err != nil {
 				capturingFatal(err, errortracking.WithField("listener", "http proxy"))
 			}
 		}(fd)
@@ -463,13 +455,7 @@ func (a *theApp) ListenHTTPSProxyv2FD(wg *sync.WaitGroup, fd uintptr, httpHandle
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
-		tlsConfig, err := a.TLSConfig()
-		if err != nil {
-			capturingFatal(err, errortracking.WithField("listener", request.SchemeHTTPS))
-		}
-
-		err = listenAndServe(fd, httpHandler, a.config.General.HTTP2, tlsConfig, limiter, true)
-		if err != nil {
+		if err := a.listenAndServe(fd, httpHandler, limiter, listenerConfig{isTLS: true, isProxyV2: true}); err != nil {
 			capturingFatal(err, errortracking.WithField("listener", request.SchemeHTTPS))
 		}
 	}()