Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions internal/cmd/serve.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,19 @@ func serveAndWait(
onShutdownSignal func(),
serveFn func() error,
) error {
debugLog.Printf("Starting HTTP server: addr=%s, shutdownTimeout=%s", httpServer.Addr, timeout)
serveErrCh := make(chan error, 1)
go func() {
err := serveFn()
if err != nil && !errors.Is(err, http.ErrServerClosed) {
debugLog.Printf("HTTP server exited unexpectedly, triggering shutdown: %v", err)
cancel()
}
serveErrCh <- err
}()

<-ctx.Done()
debugLog.Print("Shutdown initiated, beginning graceful HTTP server shutdown")
if onShutdownSignal != nil {
onShutdownSignal()
}
Expand All @@ -39,6 +42,7 @@ func serveAndWait(

shutdownErr := httpServer.Shutdown(shutdownCtx)
if shutdownErr != nil {
debugLog.Printf("Graceful shutdown failed, forcing close: %v", shutdownErr)
_ = httpServer.Close()
select {
case <-serveErrCh:
Expand All @@ -47,6 +51,7 @@ func serveAndWait(
return shutdownErr
}

debugLog.Print("HTTP server shut down gracefully")
serveErr := <-serveErrCh
if serveErr != nil && !errors.Is(serveErr, http.ErrServerClosed) {
return serveErr
Expand Down
Loading