output stdout and stderr from custom commands

karlhungus · karlhungus · commit 6de3fabc9f75 · 2022-09-15T14:31:24.000-04:00
diff --git a/pkg/healthchecker/health_checker.go b/pkg/healthchecker/health_checker.go
@@ -167,10 +167,11 @@ func execCommand(timeout time.Duration, command string, args ...string) (string,
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 	cmd := exec.CommandContext(ctx, command, args...)
-	out, err := cmd.Output()
+	out, err := cmd.CombinedOutput()
 	if err != nil {
 		glog.Infof("command %v failed: %v, %v\n", cmd, err, out)
 		return "", err
 	}
+
 	return strings.TrimSuffix(string(out), "\n"), nil
 }

Original file line number	Diff line number	Diff line change
`@@ -167,10 +167,11 @@ func execCommand(timeout time.Duration, command string, args ...string) (string,`
`167`	`167`	`ctx, cancel := context.WithTimeout(context.Background(), timeout)`
`168`	`168`	`defer cancel()`
`169`	`169`	`cmd := exec.CommandContext(ctx, command, args...)`
`170`		`- out, err := cmd.Output()`
	`170`	`+ out, err := cmd.CombinedOutput()`
`171`	`171`	`if err != nil {`
`172`	`172`	`glog.Infof("command %v failed: %v, %v\n", cmd, err, out)`
`173`	`173`	`return "", err`
`174`	`174`	`}`
	`175`	`+`
`175`	`176`	`return strings.TrimSuffix(string(out), "\n"), nil`
`176`	`177`	`}`