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/tls.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'internal/server/tls.go') diff --git a/internal/server/tls.go b/internal/server/tls.go index f538f88..565958f 100644 --- a/internal/server/tls.go +++ b/internal/server/tls.go @@ -2,11 +2,11 @@ package server import ( "context" - "crypto/tls" "crypto/x509" "net" "net/http" "strconv" + "website/internal/listenfd" "website/internal/log" "github.com/ardanlabs/conf/v3" @@ -95,8 +95,8 @@ func (s *Server) serveTLS() (err error) { tlsConfig := cfg.TLSConfig() tlsConfig.NextProtos = append([]string{"h2", "http/1.1"}, tlsConfig.NextProtos...) - sln, err := tls.Listen( - "tcp", + sln, err := listenfd.GetListenerTLS( + 0, net.JoinHostPort(s.runtimeConfig.ListenAddress, strconv.Itoa(s.runtimeConfig.TLSPort)), tlsConfig, ) @@ -104,8 +104,8 @@ func (s *Server) serveTLS() (err error) { return errors.Wrap(err, "could not bind tls socket") } - ln, err := net.Listen( - "tcp", + ln, err := listenfd.GetListener( + 1, net.JoinHostPort(s.runtimeConfig.ListenAddress, strconv.Itoa(s.runtimeConfig.Port)), ) if err != nil { -- cgit 1.4.1