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/listenfd/listenfd.go | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) (limited to 'internal/listenfd/listenfd.go') diff --git a/internal/listenfd/listenfd.go b/internal/listenfd/listenfd.go index 7d020b0..72259aa 100644 --- a/internal/listenfd/listenfd.go +++ b/internal/listenfd/listenfd.go @@ -1,16 +1,44 @@ package listenfd import ( + "crypto/tls" "net" "os" "strconv" + "website/internal/log" "github.com/pkg/errors" ) const fdStart = 3 -func GetListener(i uint64) (net.Listener, error) { +func GetListener(i uint64, addr string) (l net.Listener, err error) { + l, err = getFDSocket(0) + 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", addr) + if err != nil { + return nil, errors.Wrap(err, "could not create listener") + } + } + + return +} + +func GetListenerTLS(i uint64, addr string, config *tls.Config) (l net.Listener, err error) { + l, err = GetListener(i, addr) + if err != nil { + return nil, err + } + + return tls.NewListener(l, config), nil +} + +func getFDSocket(i uint64) (net.Listener, error) { lfds, present := os.LookupEnv("LISTEN_FDS") if !present { return nil, nil -- cgit 1.4.1