[health] minor fixes

Author: capcom6

Dockerfile.goreleaser

@@ -21,7 +21,7 @@ USER guest
 ENTRYPOINT ["/docker-entrypoint.sh"]
 
 HEALTHCHECK --interval=30s --timeout=5s --start-period=15s --retries=3 \
-    CMD [ "/app/app" "health" ]
+    CMD [ "/app/app", "health" ]
 
 CMD [ "/app/app" ]
 

build/package/Dockerfile

@@ -47,6 +47,6 @@ USER guest
 ENTRYPOINT ["/docker-entrypoint.sh"]
 
 HEALTHCHECK --interval=30s --timeout=5s --start-period=15s --retries=3 \
-    CMD [ "/app/app" "health" ]
+    CMD [ "/app/app", "health" ]
 
 CMD [ "/app/app" ]

internal/health/checker.go

@@ -2,6 +2,7 @@ package health
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	httpclient "net/http"
@@ -12,6 +13,8 @@ import (
 	"go.uber.org/zap"
 )
 
+var ErrNotHealthy = errors.New("not healthy")
+
 type Checker struct {
 	config http.Config
 
@@ -33,7 +36,12 @@ func (c *Checker) Execute(ctx context.Context) error {
 
 	client := httpclient.DefaultClient
 
-	req, err := httpclient.NewRequestWithContext(ctx, httpclient.MethodGet, "http://"+c.config.Listen+"/health/live", nil)
+	req, err := httpclient.NewRequestWithContext(
+		ctx,
+		httpclient.MethodGet,
+		"http://"+c.config.Listen+"/health/live",
+		nil,
+	)
 	if err != nil {
 		return fmt.Errorf("failed to create request: %w", err)
 	}
@@ -46,17 +54,20 @@ func (c *Checker) Execute(ctx context.Context) error {
 
 	body, err := io.ReadAll(res.Body)
 	if err != nil {
-		c.logger.Error("failed to read body", zap.Error(err))
+		return fmt.Errorf("failed to read response body: %w", err)
 	}
 
 	c.logger.Info(string(body))
 
-	if res.StatusCode >= 400 {
-		return fmt.Errorf("health check failed: %s", string(body))
+	if res.StatusCode >= httpclient.StatusBadRequest {
+		c.logger.Error("health check failed", zap.Int("status", res.StatusCode), zap.String("body", string(body)))
+		return fmt.Errorf("%w: health check failed: %s", ErrNotHealthy, string(body))
 	}
 
-	if err := c.shutdowner.Shutdown(); err != nil {
-		c.logger.Error("failed to shutdown", zap.Error(err))
+	c.logger.Info("health check passed", zap.Int("status", res.StatusCode))
+
+	if shErr := c.shutdowner.Shutdown(); shErr != nil {
+		c.logger.Error("failed to shutdown", zap.Error(shErr))
 	}
 
 	return nil