From a1ddbf3fa6d1814ebca238d0c4ed54617253689f Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Thu, 13 Jun 2024 17:08:33 +0200
Subject: server: listen on socket provided by system(f)d, if available

---
 internal/server/server.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'internal')

diff --git a/internal/server/server.go b/internal/server/server.go
index 4692965..71b9199 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -6,6 +6,7 @@ import (
 	"net"
 	"net/http"
 	"net/url"
+	"os"
 	"slices"
 	"time"
 
@@ -145,7 +146,15 @@ func New(runtimeConfig *Config) (*Server, error) {
 }
 
 func (s *Server) Start() error {
-	if err := s.ListenAndServe(); err != http.ErrServerClosed {
+	f := os.NewFile(uintptr(3), "")
+	l, err := net.FileListener(f)
+	if err != nil {
+		l, err = net.Listen("tcp", s.Addr)
+		if err != nil {
+			return errors.Wrap(err, "could not create listener")
+		}
+	}
+	if err := http.Serve(l, s.Handler); err != http.ErrServerClosed {
 		return errors.Wrap(err, "error creating/closing server")
 	}
 
-- 
cgit 1.4.1