refactor: health check logic

internal/watcher/health/monitor/fileserver.go

@@ -21,15 +21,16 @@ func NewFileServerHealthMonitor(config *health.HealthCheckConfig, path string) *
 func (s *FileServerHealthMonitor) CheckHealth() (*health.HealthCheckResult, error) {
 	start := time.Now()
 	_, err := os.Stat(s.path)
-
-	detail := ""
 	if err != nil {
-		detail = err.Error()
+		if os.IsNotExist(err) {
+			return &health.HealthCheckResult{
+				Detail: err.Error(),
+			}, nil
+		}
+		return nil, err
 	}
-
 	return &health.HealthCheckResult{
-		Healthy: err == nil,
+		Healthy: true,
 		Latency: time.Since(start),
-		Detail:  detail,
 	}, nil
 }

internal/watcher/health/monitor/http.go

@@ -37,19 +37,18 @@ func NewHTTPHealthMonitor(url *url.URL, config *health.HealthCheckConfig) *HTTPH
 	return mon
 }
 
-func (mon *HTTPHealthMonitor) CheckHealth() (result *health.HealthCheckResult, err error) {
+func (mon *HTTPHealthMonitor) CheckHealth() (*health.HealthCheckResult, error) {
 	ctx, cancel := mon.ContextWithTimeout("ping request timed out")
 	defer cancel()
 
-	req, reqErr := http.NewRequestWithContext(
+	req, err := http.NewRequestWithContext(
 		ctx,
 		mon.method,
 		mon.url.Load().JoinPath(mon.config.Path).String(),
 		nil,
 	)
-	if reqErr != nil {
+	if err != nil {
-		err = reqErr
+		return nil, err
-		return
 	}
 	req.Close = true
 	req.Header.Set("Connection", "close")
@@ -62,22 +61,26 @@ func (mon *HTTPHealthMonitor) CheckHealth() (result *health.HealthCheckResult, e
 	}
 
 	lat := time.Since(start)
-	result = &health.HealthCheckResult{}
 
 	switch {
 	case respErr != nil:
 		// treat tls error as healthy
 		var tlsErr *tls.CertificateVerificationError
 		if ok := errors.As(respErr, &tlsErr); !ok {
-			result.Detail = respErr.Error()
+			return &health.HealthCheckResult{
-			return
+				Latency: lat,
+				Detail:  respErr.Error(),
+			}, nil
 		}
 	case resp.StatusCode == http.StatusServiceUnavailable:
-		result.Detail = resp.Status
+		return &health.HealthCheckResult{
-		return
+			Latency: lat,
+			Detail:  resp.Status,
+		}, nil
 	}
 
-	result.Latency = lat
+	return &health.HealthCheckResult{
-	result.Healthy = true
+		Latency: lat,
-	return
+		Healthy: true,
+	}, nil
 }

internal/watcher/health/monitor/monitor.go

@@ -215,15 +215,14 @@ func (mon *monitor) checkUpdateHealth() error {
 	result, err := mon.checkHealth()
 
 	var lastStatus health.Status
-	if err != nil {
+	switch {
-		if result == nil {
+	case err != nil:
-			result = &health.HealthCheckResult{Healthy: false, Detail: err.Error()}
+		result = &health.HealthCheckResult{Healthy: false, Detail: err.Error()}
-		}
 		lastStatus = mon.status.Swap(health.StatusError)
-	} else if result.Healthy {
+	case result.Healthy:
 		lastStatus = mon.status.Swap(health.StatusHealthy)
 		UpdateLastSeen(mon.service)
-	} else {
+	default:
 		lastStatus = mon.status.Swap(health.StatusUnhealthy)
 	}
 	mon.lastResult.Store(result)

internal/watcher/health/monitor/raw.go

@@ -25,20 +25,19 @@ func NewRawHealthMonitor(url *url.URL, config *health.HealthCheckConfig) *RawHea
 	return mon
 }
 
-func (mon *RawHealthMonitor) CheckHealth() (result *health.HealthCheckResult, err error) {
+func (mon *RawHealthMonitor) CheckHealth() (*health.HealthCheckResult, error) {
 	ctx, cancel := mon.ContextWithTimeout("ping request timed out")
 	defer cancel()
 
 	url := mon.url.Load()
 	start := time.Now()
-	conn, dialErr := mon.dialer.DialContext(ctx, url.Scheme, url.Host)
+	conn, err := mon.dialer.DialContext(ctx, url.Scheme, url.Host)
-	result = new(health.HealthCheckResult)
+	if err != nil {
-	if dialErr != nil {
+		return nil, err
-		result.Detail = dialErr.Error()
-		return
 	}
 	defer conn.Close()
-	result.Latency = time.Since(start)
+	return &health.HealthCheckResult{
-	result.Healthy = true
+		Latency: time.Since(start),
-	return
+		Healthy: true,
+	}, nil
 }