fix(agent): detection robuste du statut instances avec fallback ps -q (v0.2.1)
This commit is contained in:
+34
-27
@@ -85,38 +85,45 @@ func getInstanceStatus(dataDir, instanceID string) string {
|
||||
}
|
||||
|
||||
engine := getContainerEngine()
|
||||
|
||||
// Try modern JSON format first
|
||||
cmd := exec.Command(engine, "compose", "-f", composeFile, "ps", "--format", "json")
|
||||
out, err := cmd.Output()
|
||||
if err == nil {
|
||||
outStr := strings.TrimSpace(string(out))
|
||||
if outStr == "" || outStr == "[]" {
|
||||
return "stopped"
|
||||
}
|
||||
if strings.HasPrefix(outStr, "[") {
|
||||
var containers []map[string]interface{}
|
||||
if err := json.Unmarshal(out, &containers); err == nil {
|
||||
for _, c := range containers {
|
||||
state, _ := c["State"].(string)
|
||||
if state == "running" {
|
||||
return "running"
|
||||
}
|
||||
}
|
||||
return "stopped"
|
||||
}
|
||||
} else {
|
||||
var c map[string]interface{}
|
||||
if err := json.Unmarshal(out, &c); err == nil {
|
||||
state, _ := c["State"].(string)
|
||||
if state == "running" {
|
||||
return "running"
|
||||
}
|
||||
return "stopped"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Fallback: use "ps -q" which is supported by all docker-compose versions
|
||||
cmd = exec.Command(engine, "compose", "-f", composeFile, "ps", "-q")
|
||||
out, err = cmd.Output()
|
||||
if err != nil {
|
||||
return "error"
|
||||
}
|
||||
|
||||
outStr := strings.TrimSpace(string(out))
|
||||
if outStr == "" || outStr == "[]" {
|
||||
return "stopped"
|
||||
}
|
||||
|
||||
// Docker compose JSON output can be a single object or an array
|
||||
if strings.HasPrefix(outStr, "[") {
|
||||
var containers []map[string]interface{}
|
||||
if err := json.Unmarshal(out, &containers); err != nil {
|
||||
return "error"
|
||||
}
|
||||
for _, c := range containers {
|
||||
state, _ := c["State"].(string)
|
||||
if state == "running" {
|
||||
return "running"
|
||||
}
|
||||
}
|
||||
return "stopped"
|
||||
}
|
||||
|
||||
var c map[string]interface{}
|
||||
if err := json.Unmarshal(out, &c); err != nil {
|
||||
return "error"
|
||||
}
|
||||
state, _ := c["State"].(string)
|
||||
if state == "running" {
|
||||
if strings.TrimSpace(string(out)) != "" {
|
||||
return "running"
|
||||
}
|
||||
return "stopped"
|
||||
|
||||
Reference in New Issue
Block a user