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"
@@ -42,11 +39,6 @@ type AppStatusInfo struct {
 	Status  Status
 }
 
-type containerState struct {
-	Status        Status
-	StatusMessage string
-}
-
 // parseAppStatus takes all the containers that matches the DockerAppLabel,
 // and construct a map of the state of an app and all its dependencies state.
 // For app that have at least 1 dependency, we calculate the overall state
@@ -59,16 +51,14 @@ type containerState struct {
 //	starting: at least one starting
 func parseAppStatus(containers []container.Summary) []AppStatusInfo {
 	apps := make([]AppStatusInfo, 0, len(containers))
-	appsStatusMap := make(map[string][]containerState)
+	appsStatusMap := make(map[string][]Status)
 	for _, c := range containers {
 		appPath, ok := c.Labels[DockerAppPathLabel]
 		if !ok {
 			continue
 		}
-		appsStatusMap[appPath] = append(appsStatusMap[appPath], containerState{
-			Status:        StatusFromDockerState(c.State),
-			StatusMessage: c.Status,
-		})
+		appsStatusMap[appPath] = append(appsStatusMap[appPath], StatusFromDockerState(c.State, c.Status))
+
 	}
 
 	appendResult := func(appPath *paths.Path, status Status) {
@@ -84,31 +74,27 @@ func parseAppStatus(containers []container.Summary) []AppStatusInfo {
 		appPath := paths.New(appPath)
 
 		//	running: all running
-		if !slices.ContainsFunc(s, func(v containerState) bool { return v.Status != StatusRunning }) {
+		if !slices.ContainsFunc(s, func(v Status) bool { return v != StatusRunning }) {
 			appendResult(appPath, StatusRunning)
 			continue
 		}
 		//	stopped: all stopped
-		if !slices.ContainsFunc(s, func(v containerState) bool { return v.Status != StatusStopped }) {
+		if !slices.ContainsFunc(s, func(v Status) bool { return v != StatusStopped }) {
 			appendResult(appPath, StatusStopped)
 			continue
 		}
 
 		// ...else we have multiple different status we calculate the status
 		// among the possible left: {failed, stopping, starting}
-		if slices.ContainsFunc(s, func(v containerState) bool { return v.Status == StatusFailed }) {
-			appendResult(appPath, StatusFailed)
-			continue
-		}
-		if slices.ContainsFunc(s, func(v containerState) bool { return v.Status == StatusStopped && checkExitCode(v) }) {
+		if slices.ContainsFunc(s, func(v Status) bool { return v == StatusFailed }) {
 			appendResult(appPath, StatusFailed)
 			continue
 		}
-		if slices.ContainsFunc(s, func(v containerState) bool { return v.Status == StatusStopping }) {
+		if slices.ContainsFunc(s, func(v Status) bool { return v == StatusStopping }) {
 			appendResult(appPath, StatusStopping)
 			continue
 		}
-		if slices.ContainsFunc(s, func(v containerState) bool { return v.Status == StatusStarting }) {
+		if slices.ContainsFunc(s, func(v Status) bool { return v == StatusStarting }) {
 			appendResult(appPath, StatusStarting)
 			continue
 		}
@@ -265,20 +251,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/helpers_test.go

@@ -74,7 +74,7 @@ func TestParseAppStatus(t *testing.T) {
 		{
 			name:           "failed",
 			containerState: []container.ContainerState{container.StateRestarting, container.StateExited},
-			statusMessage:  []string{"Restarting", "Exited (0)"},
+			statusMessage:  []string{"Restarting", "Exited (1)"},
 			want:           StatusFailed,
 		},
 	}

internal/orchestrator/status.go

@@ -17,8 +17,11 @@ package orchestrator
 
 import (
 	"fmt"
+	"regexp"
+	"strconv"
 
 	"github.com/docker/docker/api/types/container"
+	"go.bug.st/f"
 )
 
 type Status string
@@ -31,18 +34,24 @@ 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:
+		return StatusStopped
+	case container.StateExited:
+		if !isExitBySignal(statusMessage) {
+			return StatusFailed
+		}
 		return StatusStopped
 	case container.StateDead:
 		return StatusFailed
+
 	default:
 		panic("unreachable")
 	}
@@ -65,3 +74,17 @@ func (s Status) Validate() error {
 func (s Status) AllowedStatuses() []Status {
 	return []Status{StatusStarting, StatusRunning, StatusStopping, StatusStopped, StatusFailed}
 }
+
+func isExitBySignal(statusMessage string) bool {
+	var exitCodeRegex = regexp.MustCompile(`Exited \((\d+)\)`)
+	matches := exitCodeRegex.FindStringSubmatch(statusMessage)
+	if len(matches) < 2 {
+		// not matching an exit code
+		return false
+	}
+	exitCode := f.Must(strconv.Atoi(matches[1]))
+
+	// posix exit code greater than 128+n means terminated by signal https://tldp.org/LDP/abs/html/exitcodes.html
+	return exitCode > 128
+
+}