Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Also forward exec output when failing to demultiplex #379

Merged
merged 1 commit into from
Mar 1, 2024
Merged

Also forward exec output when failing to demultiplex #379

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions cmd/backup/exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,23 @@ func (s *script) exec(containerRef string, command string, user string) ([]byte,
}
defer resp.Close()

var outBuf, errBuf bytes.Buffer
var outBuf, errBuf, fullRespBuf bytes.Buffer
outputDone := make(chan error)

tee := io.TeeReader(resp.Reader, &fullRespBuf)

go func() {
_, err := stdcopy.StdCopy(&outBuf, &errBuf, resp.Reader)
_, err := stdcopy.StdCopy(&outBuf, &errBuf, tee)
outputDone <- err
}()

if err := <-outputDone; err != nil {
if body, bErr := io.ReadAll(&fullRespBuf); bErr == nil {
// if possible, try to append the exec output to the error
// as it's likely to be more relevant for users than the error from
// calling stdcopy.Copy
err = errwrap.Wrap(errors.New(string(body)), err.Error())
}
return nil, nil, errwrap.Wrap(err, "error demultiplexing output")
}

Expand Down
Loading