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

Merge pull request #3058 from dotcloud/add_stderr_hijack 

fix docker run -a stderr
This commit is contained in:
Guillaume J. Charmes 2013-12-04 17:16:56 -08:00
parent 5dab47a475 3ba279a370
commit afbea3f13f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
commands.go
View File

@ -2361,7 +2361,7 @@ func (cli *DockerCli) hijack(method, path string, setRawTerminal bool, in io.Rea
defer term.RestoreTerminal(cli.terminalFd, oldState) defer term.RestoreTerminal(cli.terminalFd, oldState)
} }
if stdout != nil { if stdout != nil || stderr != nil {
receiveStdout = utils.Go(func() (err error) { receiveStdout = utils.Go(func() (err error) {
defer func() { defer func() {
if in != nil { if in != nil {
@ -2401,7 +2401,7 @@ func (cli *DockerCli) hijack(method, path string, setRawTerminal bool, in io.Rea
return nil return nil
}) })
if stdout != nil { if stdout != nil || stderr != nil {
if err := <-receiveStdout; err != nil { if err := <-receiveStdout; err != nil {
utils.Errorf("Error receiveStdout: %s", err) utils.Errorf("Error receiveStdout: %s", err)
return err return err