Merge pull request #1091 from rajasec/ps-errors

hqhq · web-flow · commit 19ab30436754 · 2016-10-19T11:11:41.000+08:00
ps error logging improvement
diff --git a/ps.go b/ps.go
@@ -51,9 +51,10 @@ var psCommand = cli.Command{
 			psArgs = []string{"-ef"}
 		}
 
-		output, err := exec.Command("ps", psArgs...).Output()
+		cmd := exec.Command("ps", psArgs...)
+		output, err := cmd.CombinedOutput()
 		if err != nil {
-			return err
+			return fmt.Errorf("%s: %s", err, output)
 		}
 
 		lines := strings.Split(string(output), "\n")

Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,10 @@ var psCommand = cli.Command{`
`51`	`51`	`psArgs = []string{"-ef"}`
`52`	`52`	`}`
`53`	`53`
`54`		`- output, err := exec.Command("ps", psArgs...).Output()`
	`54`	`+ cmd := exec.Command("ps", psArgs...)`
	`55`	`+ output, err := cmd.CombinedOutput()`
`55`	`56`	`if err != nil {`
`56`		`- return err`
	`57`	`+ return fmt.Errorf("%s: %s", err, output)`
`57`	`58`	`}`
`58`	`59`
`59`	`60`	`lines := strings.Split(string(output), "\n")`