mirror of
https://gitee.com/fit2cloud-feizhiyun/1Panel.git
synced 2026-11-20 07:49:30 +08:00
fix: parse supervisor uptime with optional days segment (#12713)
This commit is contained in:
@@ -636,8 +636,7 @@ func getProcessStatus(config *response.SupervisorProcessConfig, containerName st
|
||||
Status: fields[1],
|
||||
}
|
||||
if fields[1] == "RUNNING" {
|
||||
status.PID = strings.TrimSuffix(fields[3], ",")
|
||||
status.Uptime = fields[5]
|
||||
status.PID, status.Uptime = parseSupervisorRunningDetails(fields)
|
||||
} else {
|
||||
status.Msg = strings.Join(fields[2:], " ")
|
||||
}
|
||||
@@ -646,3 +645,19 @@ func getProcessStatus(config *response.SupervisorProcessConfig, containerName st
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func parseSupervisorRunningDetails(fields []string) (string, string) {
|
||||
var pid, uptime string
|
||||
if len(fields) > 3 && fields[2] == "pid" {
|
||||
pid = strings.TrimSuffix(fields[3], ",")
|
||||
}
|
||||
for i := 4; i < len(fields); i++ {
|
||||
if strings.TrimSuffix(fields[i], ",") == "uptime" {
|
||||
if i+1 < len(fields) {
|
||||
uptime = strings.Join(fields[i+1:], " ")
|
||||
}
|
||||
break
|
||||
}
|
||||
}
|
||||
return pid, uptime
|
||||
}
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
package service
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestParseSupervisorRunningDetails(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
line string
|
||||
wantPID string
|
||||
wantUptime string
|
||||
}{
|
||||
{
|
||||
name: "short uptime",
|
||||
line: "test:test_00 RUNNING pid 123, uptime 0:12:34",
|
||||
wantPID: "123",
|
||||
wantUptime: "0:12:34",
|
||||
},
|
||||
{
|
||||
name: "single day uptime",
|
||||
line: "test:test_00 RUNNING pid 123, uptime 1 day, 0:12:34",
|
||||
wantPID: "123",
|
||||
wantUptime: "1 day, 0:12:34",
|
||||
},
|
||||
{
|
||||
name: "multiple days uptime",
|
||||
line: "test:test_00 RUNNING pid 123, uptime 103 days, 0:12:34",
|
||||
wantPID: "123",
|
||||
wantUptime: "103 days, 0:12:34",
|
||||
},
|
||||
{
|
||||
name: "process name is uptime",
|
||||
line: "uptime RUNNING pid 123, uptime 0:12:34",
|
||||
wantPID: "123",
|
||||
wantUptime: "0:12:34",
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
pid, uptime := parseSupervisorRunningDetails(strings.Fields(tt.line))
|
||||
if pid != tt.wantPID {
|
||||
t.Fatalf("pid = %q, want %q", pid, tt.wantPID)
|
||||
}
|
||||
if uptime != tt.wantUptime {
|
||||
t.Fatalf("uptime = %q, want %q", uptime, tt.wantUptime)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user