From e29149ae9b0cd31f38beb38b0f4ea4e1599f4d93 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Fri, 28 Jun 2024 16:54:42 +0200
Subject: use socket passing also for TLS

---
 internal/server/tcp.go | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

(limited to 'internal/server/tcp.go')

diff --git a/internal/server/tcp.go b/internal/server/tcp.go
index 4dc3314..b38da3d 100644
--- a/internal/server/tcp.go
+++ b/internal/server/tcp.go
@@ -1,26 +1,13 @@
 package server
 
 import (
-	"net"
-
 	"website/internal/listenfd"
-	"website/internal/log"
-
-	"github.com/pkg/errors"
 )
 
 func (s *Server) serveTCP() error {
-	l, err := listenfd.GetListener(0)
+	l, err := listenfd.GetListener(0, s.Addr)
 	if err != nil {
-		log.Warn("could not create listener from listenfd", "error", err)
-	}
-
-	log.Debug("listener from listenfd?", "passed", l != nil)
-	if l == nil {
-		l, err = net.Listen("tcp", s.Addr)
-		if err != nil {
-			return errors.Wrap(err, "could not create listener")
-		}
+		return err
 	}
 
 	return s.Serve(l)
-- 
cgit 1.4.1