lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

engine: resources: Also look at stderr

Browse Source 
We might have an executing program which prints on stderr which we were
effectively ignoring. Read from that too.
This commit is contained in:
James Shubin
2024-03-10 17:00:02 -04:00
parent c5e3e0ee70
commit 79d5873445
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
engine/resources/exec.go
View File

@@ -34,6 +34,7 @@ import (
"bytes" "bytes"
"context" "context"
"fmt" "fmt"
"io"
"os/exec" "os/exec"
"os/user" "os/user"
"sort" "sort"
@@ -905,10 +906,17 @@ type cmdOutput struct {
// Cancelling the context merely unblocks the sending on the output channel, it // Cancelling the context merely unblocks the sending on the output channel, it
// does not Kill the cmd process. For that you must do it yourself elsewhere. // does not Kill the cmd process. For that you must do it yourself elsewhere.
func (obj *ExecRes) cmdOutputRunner(ctx context.Context, cmd *exec.Cmd) (chan *cmdOutput, error) { func (obj *ExecRes) cmdOutputRunner(ctx context.Context, cmd *exec.Cmd) (chan *cmdOutput, error) {
cmdReader, err := cmd.StdoutPipe() stdoutReader, err := cmd.StdoutPipe()
if err != nil { if err != nil {
return nil, errwrap.Wrapf(err, "error creating StdoutPipe for Cmd") return nil, errwrap.Wrapf(err, "error creating StdoutPipe for Cmd")
} }
stderrReader, err := cmd.StderrPipe()
if err != nil {
return nil, errwrap.Wrapf(err, "error creating StderrPipe for Cmd")
}
// XXX: Can io.MultiReader when one of these is still open? Is there an
// issue or race here about calling cmd.Wait() if only one of them dies?
cmdReader := io.MultiReader(stdoutReader, stderrReader)
scanner := bufio.NewScanner(cmdReader) scanner := bufio.NewScanner(cmdReader)
if err := cmd.Start(); err != nil { if err := cmd.Start(); err != nil {
return nil, errwrap.Wrapf(err, "error starting Cmd") return nil, errwrap.Wrapf(err, "error starting Cmd")