エラー時もstdout, stderrを返すように変更

fmhr · Apr 19, 2024 · 6b46086 · 6b46086
1 parent d14ba76
commit 6b46086
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/unix_specific.go b/unix_specific.go
@@ -37,8 +37,11 @@ func runCommandWithTimeout(cmdStrings []string, cnf *Config) ([]byte, string, er
 		}
 	case err := <-errCh:
 		if err != nil {
+			rtn := make([]byte, 0, len(stdoutBuf.Bytes())+len(stderrBuf.Bytes()))
+			rtn = append(rtn, stdoutBuf.Bytes()...)
+			rtn = append(rtn, stderrBuf.Bytes()...)
 			log.Println("Error: ", err, "command:", cmd.String())
-			return nil, result, fmt.Errorf("cmd.Wait() failed with: %v", err)
+			return rtn, result, fmt.Errorf("cmd.Wait() failed with: %v", err)
 		}
 	}