handle ct state in helpers

Author: giulio93

internal/orchestrator/helpers.go

@@ -19,8 +19,9 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"log/slog"
+	"regexp"
 	"slices"
+	"strconv"
 	"strings"
 
 	"github.com/arduino/go-paths-helper"
@@ -50,12 +51,11 @@ type containerState struct {
 // For app that have at least 1 dependency, we calculate the overall state
 // as follow:
 //
-//			running: all running
-//			stopped: all stopped
-//			failed: at least one failed
-//	     	stopping: at least one stopping
-//		    stopped: at least one stopped
-//			starting: at least one starting
+//	running: all running
+//	stopped: all stopped
+//	failed: at least one failed
+//	stopping: at least one stopping
+//	starting: at least one starting
 func parseAppStatus(containers []container.Summary) []AppStatusInfo {
 	apps := make([]AppStatusInfo, 0, len(containers))
 	appsStatusMap := make(map[string][]containerState)
@@ -68,12 +68,6 @@ func parseAppStatus(containers []container.Summary) []AppStatusInfo {
 			Status:        StatusFromDockerState(c.State),
 			StatusMessage: c.Status,
 		})
-		slog.Debug("Container status",
-			slog.String("appPath", appPath),
-			slog.String("containerID", c.ID),
-			slog.String("state", string(c.State)),
-			slog.String("statusMessage", c.Status),
-		)
 	}
 
 	appendResult := func(appPath *paths.Path, status Status) {
@@ -106,7 +100,7 @@ func parseAppStatus(containers []container.Summary) []AppStatusInfo {
 			continue
 		}
 		if slices.ContainsFunc(s, func(v containerState) bool {
-			return v.Status == StatusStopped && strings.Contains(v.StatusMessage, "Exited (0)")
+			return v.Status == StatusStopped && checkExitCode(v.StatusMessage)
 		}) {
 			appendResult(appPath, StatusFailed)
 			continue
@@ -272,3 +266,19 @@ func setStatusLeds(trigger LedTrigger) error {
 	}
 	return nil
 }
+
+func checkExitCode(statusMessage string) bool {
+	var exitCodeRegex = regexp.MustCompile(`Exited \((\d+)\)`)
+
+	matches := exitCodeRegex.FindStringSubmatch(statusMessage)
+	if len(matches) < 2 {
+		return false
+	}
+
+	exitCode, err := strconv.Atoi(matches[1])
+	if err != nil {
+		return false
+	}
+
+	return exitCode >= 0 && exitCode < 128
+}

internal/orchestrator/helpers_test.go

@@ -27,46 +27,55 @@ func TestParseAppStatus(t *testing.T) {
 	tests := []struct {
 		name           string
 		containerState []container.ContainerState
+		statusMessage  []string
 		want           Status
 	}{
 		{
 			name:           "everything running",
 			containerState: []container.ContainerState{container.StateRunning, container.StateRunning},
+			statusMessage:  []string{"Up 5 minutes", "Up 10 minutes"},
 			want:           StatusRunning,
 		},
 		{
 			name:           "everything stopped",
 			containerState: []container.ContainerState{container.StateCreated, container.StatePaused, container.StateExited},
+			statusMessage:  []string{"Created", "Paused", "Exited (137)"},
 			want:           StatusStopped,
 		},
 		{
 			name:           "failed container",
 			containerState: []container.ContainerState{container.StateRunning, container.StateDead},
+			statusMessage:  []string{"Up 5 minutes", "Dead"},
 			want:           StatusFailed,
 		},
 		{
 			name:           "failed container takes precedence over stopping and starting",
 			containerState: []container.ContainerState{container.StateRunning, container.StateDead, container.StateRemoving, container.StateRestarting},
+			statusMessage:  []string{"Up 5 minutes", "Dead", "Removing", "Restarting"},
 			want:           StatusFailed,
 		},
 		{
 			name:           "stopping",
 			containerState: []container.ContainerState{container.StateRunning, container.StateRemoving},
+			statusMessage:  []string{"Up 5 minutes", "Removing"},
 			want:           StatusStopping,
 		},
 		{
 			name:           "stopping takes precedence over starting",
 			containerState: []container.ContainerState{container.StateRunning, container.StateRestarting, container.StateRemoving},
+			statusMessage:  []string{"Up 5 minutes", "Restarting", "Removing"},
 			want:           StatusStopping,
 		},
 		{
 			name:           "starting",
 			containerState: []container.ContainerState{container.StateRestarting, container.StateExited},
+			statusMessage:  []string{"Restarting", "Exited (129)"},
 			want:           StatusStarting,
 		},
 		{
 			name:           "failed",
 			containerState: []container.ContainerState{container.StateRestarting, container.StateExited},
+			statusMessage:  []string{"Restarting", "Exited (0)"},
 			want:           StatusFailed,
 		},
 	}