p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove useless goroutine

Browse Source 
Upstream-commit: e2d034e48858d0afe9ee0f88f04e40cbf95ab8ba
Component: engine
This commit is contained in:
Guillaume J. Charmes
2013-06-18 10:06:26 -07:00
parent 43ecdc208f
commit 7bd657cfeb
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/engine/commands.go
View File

@ -1270,7 +1270,6 @@ func (cli *DockerCli) CmdRun(args ...string) error {
if !config.AttachStdout && !config.AttachStderr {
fmt.Println(out.ID)
} else {
chErrors := make(chan error)
if config.Tty {
cli.monitorTtySize(out.ID)
}
@ -1288,10 +1287,7 @@ func (cli *DockerCli) CmdRun(args ...string) error {
if config.AttachStderr {
v.Set("stderr", "1")
}
go func() {
chErrors <- cli.hijack("POST", "/containers/"+out.ID+"/attach?"+v.Encode(), config.Tty, os.Stdin, os.Stdout)
}()
if err := <-chErrors; err != nil {
if err := cli.hijack("POST", "/containers/"+out.ID+"/attach?"+v.Encode(), config.Tty, os.Stdin, os.Stdout); err != nil {
utils.Debugf("Error hijack: %s", err)
return err
}