Merge pull request #85 from erka/shutdown-https-server

Enable graceful shutdown for https server

Author: kevinmcconnell

internal/server/server.go

@@ -3,6 +3,7 @@ package server
 import (
 	"context"
 	"crypto/tls"
+	"errors"
 	"fmt"
 	"log/slog"
 	"net"
@@ -57,8 +58,11 @@ func (s *Server) Stop() {
 	ctx, cancel := context.WithTimeout(context.Background(), shutdownTimeout)
 	defer cancel()
 
-	s.commandHandler.Close()
-	s.httpServer.Shutdown(ctx)
+	PerformConcurrently(
+		func() { _ = s.commandHandler.Close() },
+		func() { s.stopHTTPServer(ctx, s.httpServer) },
+		func() { s.stopHTTPServer(ctx, s.httpsServer) },
+	)
 
 	slog.Info("Server stopped")
 }
@@ -128,3 +132,14 @@ func (s *Server) buildHandler() http.Handler {
 
 	return handler
 }
+
+func (s *Server) stopHTTPServer(ctx context.Context, server *http.Server) {
+	err := server.Shutdown(ctx)
+	if err != nil {
+		if errors.Is(err, context.DeadlineExceeded) {
+			slog.Warn("Closing active connections")
+		} else {
+			slog.Error("Error while attempting to stop server", "error", err)
+		}
+	}
+}

internal/server/util.go

@@ -0,0 +1,20 @@
+package server
+
+import (
+	"sync"
+)
+
+func PerformConcurrently(fns ...func()) {
+	var wg sync.WaitGroup
+
+	wg.Add(len(fns))
+
+	for _, fn := range fns {
+		go func() {
+			defer wg.Done()
+			fn()
+		}()
+	}
+
+	wg.Wait()
+}