about summary refs log tree commit diff stats
path: root/internal/server/tcp.go
diff options
context:
space:
mode:
Diffstat (limited to 'internal/server/tcp.go')
-rw-r--r--internal/server/tcp.go19
1 files changed, 3 insertions, 16 deletions
diff --git a/internal/server/tcp.go b/internal/server/tcp.go
index 4dc3314..1627854 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"
+	"go.alanpearce.eu/x/listenfd"
 )
 
 func (s *Server) serveTCP() error {
-	l, err := listenfd.GetListener(0)
+	l, err := listenfd.GetListener(0, s.Addr, s.log.Named("tcp.listenfd"))
 	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)