Add main PID to print

Signed-off-by: Valentin Pichard <valentin.pichard@dimelo.com>
ylecuyer · Feb 8, 2019 · ed25734 · ed25734
1 parent bc18eaf
commit ed25734
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/helper/json.go b/helper/json.go
@@ -4,6 +4,7 @@ type pumaStatus struct {
 	BootedWorkers int `json:"booted_workers"`
 	OldWorkers    int `json:"old_workers"`
 	Phase         int `json:"phase"`
+	MainPid       int `json:"main_pid"`
 	WorkerStatus  []struct {
 		Booted      bool   `json:"booted"`
 		Index       int    `json:"index"`
@@ -36,6 +37,7 @@ type pumaStatusApplication struct {
 	Worker              []pumaStatusWorker `json:"worker"`
 	TotalMaxThreads     int                `json:"total_max_threads"`
 	TotalCurrentThreads int                `json:"total_current_threads"`
+	MainPid             int                `json:"main_pid"`
 }
 
 type pumaStatusWorker struct {

diff --git a/helper/print.go b/helper/print.go
@@ -32,13 +32,13 @@ func (ps pumaStatusFinalOutput) printStatusApps() error {
 				fmt.Printf("  About: %s\n", key.Description)
 			}
 			fmt.Printf("  App root: %s\n", key.RootPath)
-			fmt.Printf("  Booted workers: %d\n", key.BootedWorkers)
+			fmt.Printf("  Booted workers: %d | PID: %d\n", key.BootedWorkers, key.MainPid)
 			fmt.Printf("  Current phase: %d | Old workers: %d | Active threads: %s\n\n", key.AppCurrentPhase, key.OldWorkers, asciiThreadLoad(key.TotalCurrentThreads, key.TotalMaxThreads))
 		} else {
 			if key.OldWorkers > 0 {
-				fmt.Printf("-> %s (%s) Phase: %d | Workers: %d (Old: %d) | Active threads: %s\n\n", key.Name, key.RootPath, key.AppCurrentPhase, key.BootedWorkers, key.OldWorkers, asciiThreadLoad(key.TotalCurrentThreads, key.TotalMaxThreads))
+				fmt.Printf("-> %s %d (%s) Phase: %d | Workers: %d (Old: %d) | Active threads: %s\n\n", key.Name, key.MainPid, key.RootPath, key.AppCurrentPhase, key.BootedWorkers, key.OldWorkers, asciiThreadLoad(key.TotalCurrentThreads, key.TotalMaxThreads))
 			} else {
-				fmt.Printf("-> %s (%s) Phase: %d | Workers: %d | Active threads: %s\n\n", key.Name, key.RootPath, key.AppCurrentPhase, key.BootedWorkers, asciiThreadLoad(key.TotalCurrentThreads, key.TotalMaxThreads))
+				fmt.Printf("-> %s %d (%s) Phase: %d | Workers: %d | Active threads: %s\n\n", key.Name, key.MainPid, key.RootPath, key.AppCurrentPhase, key.BootedWorkers, asciiThreadLoad(key.TotalCurrentThreads, key.TotalMaxThreads))
 			}
 		}
 

diff --git a/helper/status.go b/helper/status.go
@@ -107,6 +107,7 @@ func retrieveStatusData() (*pumaStatusFinalOutput, error) {
 			AppCurrentPhase:     ps.Phase,
 			TotalCurrentThreads: tcthreads,
 			TotalMaxThreads:     tmthreads,
+			MainPid:             ps.MainPid,
 		}
 
 		apps = append(apps, app)

diff --git a/helper/utils.go b/helper/utils.go
@@ -27,14 +27,13 @@ type pumaStateFile struct {
 
 // readPumaStats get and unmarshal JSON using puma unix socket
 func readPumaStats(pspath string) (*pumaStatus, error) {
-	var ps pumaStatus
-	var psf pumaStateFile
-
 	data, err := ioutil.ReadFile(pspath)
 	if err != nil {
 		return nil, err
 	}
 
+	var psf pumaStateFile
+
 	if err := yaml.Unmarshal(data, &psf); err != nil {
 		return nil, err
 	}
@@ -60,6 +59,10 @@ func readPumaStats(pspath string) (*pumaStatus, error) {
 	//fmt.Println(pcpath, pspath)
 	//output, err := exec.Command("cat", "/go/src/github.com/dimelo/puma-helper/output.txt").Output()
 
+	ps := pumaStatus{
+		MainPid: psf.Pid,
+	}
+
 	if err := json.Unmarshal(body, &ps); err != nil {
 		return nil, err
 	}