feat: handle timeout when shutting down http server

thoas · Sep 26, 2023 · 75436a6 · 75436a6
1 parent 50cf3a2
commit 75436a6
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/server/http.go b/server/http.go
@@ -244,7 +244,19 @@ func (s *HTTPServer) Run(ctx context.Context) error {
 	case err := <-cerr:
 		return err
 	case <-ctx.Done():
-		s.processor.Logger.Debug("Shutdown HTTP server")
-		return srv.Shutdown(context.Background())
+		s.processor.Logger.Debug("Shutting down HTTP server")
+		ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+		defer cancel()
+		if err := srv.Shutdown(ctx); err != nil {
+			return err
+		}
+		select {
+		case <-ctx.Done():
+			s.processor.Logger.Debug("HTTP server timeout")
+		}
+
+		s.processor.Logger.Debug("HTTP server existing")
+
+		return nil
 	}
 }