check function in status

Author: giulio93

internal/orchestrator/helpers.go

@@ -19,10 +19,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"log/slog"
-	"regexp"
 	"slices"
-	"strconv"
 	"strings"
 
 	"github.com/arduino/go-paths-helper"
@@ -43,8 +40,7 @@ type AppStatusInfo struct {
 }
 
 type containerState struct {
-	Status        Status
-	StatusMessage string
+	Status Status
 }
 
 // parseAppStatus takes all the containers that matches the DockerAppLabel,
@@ -66,8 +62,7 @@ func parseAppStatus(containers []container.Summary) []AppStatusInfo {
 			continue
 		}
 		appsStatusMap[appPath] = append(appsStatusMap[appPath], containerState{
-			Status:        StatusFromDockerState(c.State),
-			StatusMessage: c.Status,
+			Status: StatusFromDockerState(c.State, c.Status),
 		})
 	}
 
@@ -100,7 +95,7 @@ func parseAppStatus(containers []container.Summary) []AppStatusInfo {
 			appendResult(appPath, StatusFailed)
 			continue
 		}
-		if slices.ContainsFunc(s, func(v containerState) bool { return v.Status == StatusStopped && checkExitCode(v) }) {
+		if slices.ContainsFunc(s, func(v containerState) bool { return v.Status == StatusStopped }) {
 			appendResult(appPath, StatusFailed)
 			continue
 		}
@@ -265,20 +260,3 @@ func setStatusLeds(trigger LedTrigger) error {
 	}
 	return nil
 }
-
-func checkExitCode(state containerState) bool {
-	var exitCodeRegex = regexp.MustCompile(`Exited \((\d+)\)`)
-	result := false
-	matches := exitCodeRegex.FindStringSubmatch(state.StatusMessage)
-
-	exitCode, err := strconv.Atoi(matches[1])
-	if err != nil {
-		slog.Error("Failed to parse exit code from status message", slog.String("statusMessage", state.StatusMessage), slog.String("error", err.Error()))
-		return false
-	}
-	if exitCode >= 0 && exitCode < 128 {
-		result = true
-	}
-
-	return result
-}

internal/orchestrator/status.go

@@ -17,6 +17,9 @@ package orchestrator
 
 import (
 	"fmt"
+	"log/slog"
+	"regexp"
+	"strconv"
 
 	"github.com/docker/docker/api/types/container"
 )
@@ -31,18 +34,22 @@ const (
 	StatusFailed   Status = "failed"
 )
 
-func StatusFromDockerState(s container.ContainerState) Status {
+func StatusFromDockerState(s container.ContainerState, statusMessage string) Status {
 	switch s {
 	case container.StateRunning:
 		return StatusRunning
 	case container.StateRestarting:
 		return StatusStarting
 	case container.StateRemoving:
 		return StatusStopping
-	case container.StateCreated, container.StateExited, container.StatePaused:
+	case container.StateCreated, container.StatePaused, container.StateExited:
+		if checkExitCode(statusMessage) {
+			return StatusFailed
+		}
 		return StatusStopped
 	case container.StateDead:
 		return StatusFailed
+
 	default:
 		panic("unreachable")
 	}
@@ -65,3 +72,20 @@ func (s Status) Validate() error {
 func (s Status) AllowedStatuses() []Status {
 	return []Status{StatusStarting, StatusRunning, StatusStopping, StatusStopped, StatusFailed}
 }
+
+func checkExitCode(statusMessage string) bool {
+	var exitCodeRegex = regexp.MustCompile(`Exited \((\d+)\)`)
+	result := false
+	matches := exitCodeRegex.FindStringSubmatch(statusMessage)
+
+	exitCode, err := strconv.Atoi(matches[1])
+	if err != nil {
+		slog.Error("Failed to parse exit code from status message", slog.String("statusMessage", statusMessage), slog.String("error", err.Error()))
+		return false
+	}
+	if exitCode >= 0 && exitCode < 128 {
+		result = true
+	}
+
+	return result
+}