Make TestHealthCheckHandlerContext_ServeHTTP more stable

acronis · Aug 26, 2024 · bb8e330 · bb8e330
1 parent a928702
commit bb8e330
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/httpserver/health_check.go b/httpserver/health_check.go
@@ -78,7 +78,9 @@ func NewHealthCheckHandlerContext(fn HealthCheckContext) *HealthCheckHandler {
 func (h *HealthCheckHandler) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 	hcResult, err := h.healthCheckFn(r.Context())
 	if err != nil {
-		middleware.GetLoggerFromContext(r.Context()).Error("error while checking health", log.Error(err))
+		if logger := middleware.GetLoggerFromContext(r.Context()); logger != nil {
+			logger.Error("error while checking health", log.Error(err))
+		}
 		if errors.Is(err, context.Canceled) {
 			rw.WriteHeader(StatusClientClosedRequest)
 			return

diff --git a/httpserver/health_check_test.go b/httpserver/health_check_test.go
@@ -169,7 +169,7 @@ func TestHealthCheckHandlerContext_ServeHTTP(t *testing.T) {
 	})
 
 	t.Run("health-check responds error on client timeout", func(t *testing.T) {
-		const requestTimeout = 10 * time.Millisecond
+		const requestTimeout = 100 * time.Millisecond
 
 		h := NewHealthCheckHandlerContext(func(ctx context.Context) (HealthCheckResult, error) {
 			select {