fix: avoid deadlock if continuous stream of logs are received

Previous implementation would not start the shutdown process until no incoming http request is received. The issue is that, in case a constant stream of events, this would deadlock and never refuse new connections.

Signed-off-by: grouville <[email protected]>

main.go

@@ -114,13 +114,13 @@ func serve(ctx context.Context, logger *zap.SugaredLogger) (err error) {
 		cancel()
 	}()
 
-	// Wait for in-flight requests to complete before shutting down
-	wg.Wait()
-
 	if err = srv.Shutdown(ctxShutDown); err != nil {
 		logger.Fatalf("http server shutdown failed:%+s", err)
 	}
 
+	// Wait for in-flight requests to complete before shutting down
+	wg.Wait()
+
 	logger.Infof("http server shutdown gracefully")
 
 	if err == http.ErrServerClosed {

pkg/logger/logger_test.go

@@ -121,12 +121,12 @@ loop:
 		<-shutdownMessage
 		log.Println("Shutting down server...")
 
-		// Wait for all requests to be processed
-		wg.Wait()
-
 		if err := server.Shutdown(context.Background()); err != nil {
 			log.Fatalf("Server Shutdown: %v", err)
 		}
+
+		// Wait for all requests to be processed
+		wg.Wait()
 	}()
 }