From fbcd8503b3a29bdbb7a52d6433b0ab79877bc4ce Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Mon, 27 May 2013 16:07:05 +0000 Subject: [PATCH] remove hijack on the client in logs, and split stdout / stderr --- commands.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/commands.go b/commands.go index 6c4dcd14d6..097ece9fce 100644 --- a/commands.go +++ b/commands.go @@ -920,12 +920,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); 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