docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8164 from unclejack/fix_utils_race 

integcli: fix race in runCommandWithStdoutStderr
This commit is contained in:
Alexandr Morozov 2014-09-22 19:14:40 +04:00
parent 3c03506cc2 c69896d8a0
commit 1df4255102
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
integration-cli/utils.go
View File

@ -44,14 +44,13 @@ func runCommandWithOutput(cmd *exec.Cmd) (output string, exitCode int, err error
} }
func runCommandWithStdoutStderr(cmd *exec.Cmd) (stdout string, stderr string, exitCode int, err error) { func runCommandWithStdoutStderr(cmd *exec.Cmd) (stdout string, stderr string, exitCode int, err error) {
var (
stderrBuffer, stdoutBuffer bytes.Buffer
)
exitCode = 0 exitCode = 0
var stderrBuffer bytes.Buffer cmd.Stderr = &stderrBuffer
stderrPipe, err := cmd.StderrPipe() cmd.Stdout = &stdoutBuffer
if err != nil { err = cmd.Run()
return "", "", -1, err
}
go io.Copy(&stderrBuffer, stderrPipe)
out, err := cmd.Output()
if err != nil { if err != nil {
var exiterr error var exiterr error
@ -61,8 +60,8 @@ func runCommandWithStdoutStderr(cmd *exec.Cmd) (stdout string, stderr string, ex
exitCode = 127 exitCode = 127
} }
} }
stdout = string(out) stdout = stdoutBuffer.String()
stderr = string(stderrBuffer.Bytes()) stderr = stderrBuffer.String()
return return
} }