0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #727 from dotcloud/remove_hijack_logs-feature

Browse source 
* API: remove hijack on the client in logs, and split stdout / stderr
This commit is contained in:
Guillaume J. Charmes 2013-05-31 14:43:59 -07:00
commit 80b8756da3
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
commands.go
View file

@ -988,12 +988,10 @@ func (cli *DockerCli) CmdLogs(args ...string) error {
return nil
}
v := url.Values{}
v.Set("logs", "1")
v.Set("stdout", "1")
v.Set("stderr", "1")
if err := cli.hijack("POST", "/containers/"+cmd.Arg(0)+"/attach?"+v.Encode(), false, nil, os.Stdout); err != nil {
if err := cli.stream("POST", "/containers/"+cmd.Arg(0)+"/attach?logs=1&stdout=1", nil, os.Stdout); err != nil {
return err
}
if err := cli.stream("POST", "/containers/"+cmd.Arg(0)+"/attach?logs=1&stderr=1", nil, os.Stderr); err != nil {
return err
}
return nil