Add global uptime process

Signed-off-by: Valentin Pichard <[email protected]>

helper/json.go

@@ -48,4 +48,5 @@ type pumaStatusWorker struct {
 	Memory         float64 `json:"memory"`
 	TotalTimeExec  int     `json:"total_time_exec"`
 	CurrentPhase   int     `json:"current_phase"`
+	Uptime         int64   `json:"uptime"`
 }

helper/print.go

@@ -65,7 +65,7 @@ func printStatusWorkers(ps []pumaStatusWorker, currentPhase int) error {
 				lcheckin = Brown(timeElapsed(key.LastCheckin))
 			}
 
-			fmt.Printf("* %d [%d] CPU: %s Mem: %s Phase: %s Runtime: %s Threads: %s (Last checkin: %s)\n", key.ID, key.Pid, colorCPU(key.CPUPercent), colorMemory(key.Memory), phase, timeElapsed(time.Now().Add(time.Duration(-int64(key.TotalTimeExec))*time.Second).Format(time.RFC3339)), asciiThreadLoad(key.CurrentThreads, key.MaxThreads), lcheckin)
+			fmt.Printf("* %d [%d] CPU: %s Mem: %s Phase: %s Uptime: %s Threads: %s (Last checkin: %s)\n", key.ID, key.Pid, colorCPU(key.CPUPercent), colorMemory(key.Memory), phase, timeElapsed(timeElapsed(time.Unix(key.Uptime, 0).Format(time.RFC3339))), asciiThreadLoad(key.CurrentThreads, key.MaxThreads), lcheckin)
 			continue
 		}
 
@@ -77,7 +77,7 @@ func printStatusWorkers(ps []pumaStatusWorker, currentPhase int) error {
 		}
 
 		fmt.Printf("*  %s ~ PID %d\t\tWorker ID %d\tCPU: %s%%\tMem: %s MiB\tPhase: %s\n", bootbtn, key.Pid, key.ID, colorCPU(key.CPUPercent), colorMemory(key.Memory), phase)
-		fmt.Printf("  Active threads: %s\tLast checkin: %s\tTotal exec time: %s\n", asciiThreadLoad(key.CurrentThreads, key.MaxThreads), timeElapsed(key.LastCheckin), timeElapsed(time.Now().Add(time.Duration(-int64(key.TotalTimeExec))*time.Second).Format(time.RFC3339)))
+		fmt.Printf("  Active threads: %s\tLast checkin: %s\tTotal CPU time: %s\tUptime: %s\n", asciiThreadLoad(key.CurrentThreads, key.MaxThreads), timeElapsed(key.LastCheckin), timeElapsed(time.Now().Add(time.Duration(-int64(key.TotalTimeExec))*time.Second).Format(time.RFC3339)), timeElapsed(time.Unix(key.Uptime, 0).Format(time.RFC3339)))
 	}
 	return nil
 }

helper/status.go

@@ -70,7 +70,13 @@ func retrieveStatusData() (*pumaStatusFinalOutput, error) {
 				return nil, err
 			}
 
-			ttime, err := getTotalTimeFromPID(pid)
+			ttime, err := getTotalExecTimeFromPID(pid)
+			if err != nil {
+				return nil, err
+			}
+
+			// Assuming this timestamp is in milliseconds
+			utime, err := getTotalUptimeFromPID(pid)
 			if err != nil {
 				return nil, err
 			}
@@ -86,6 +92,7 @@ func retrieveStatusData() (*pumaStatusFinalOutput, error) {
 				Memory:         mem,
 				TotalTimeExec:  int(ttime),
 				CurrentPhase:   v.Phase,
+				Uptime:         utime / 1000,
 			}
 
 			workers = append(workers, worker)

helper/utils.go

@@ -37,7 +37,7 @@ func readPumaStats(pcpath, pspath string) (pumaStatus, error) {
 	return ps, nil
 }
 
-func getTotalTimeFromPID(pid int32) (float64, error) {
+func getTotalExecTimeFromPID(pid int32) (float64, error) {
 	p, err := proc.NewProcess(pid)
 	if err != nil {
 		return 0.0, err
@@ -46,6 +46,18 @@ func getTotalTimeFromPID(pid int32) (float64, error) {
 	return t.Total(), nil
 }
 
+func getTotalUptimeFromPID(pid int32) (int64, error) {
+	p, err := proc.NewProcess(pid)
+	if err != nil {
+		return 0, err
+	}
+	t, err := p.CreateTime()
+	if err != nil {
+		return 0, err
+	}
+	return t, nil
+}
+
 func getCPUFromPID(pid int32) (float64, error) {
 	p, err := proc.NewProcess(pid)
 	if err != nil {