From 1b0fd7ead33722d8782634d54cbd797f284aa085 Mon Sep 17 00:00:00 2001
From: Victor Vieux <victor.vieux@dotcloud.com>
Date: Thu, 18 Jul 2013 13:29:40 +0000
Subject: [PATCH] add debug and simplify docker logs

---
 commands.go | 5 +----
 server.go   | 1 +
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/commands.go b/commands.go
index b581590bc2..def2ff72d7 100644
--- a/commands.go
+++ b/commands.go
@@ -1099,10 +1099,7 @@ func (cli *DockerCli) CmdLogs(args ...string) error {
 		return nil
 	}
 
-	if err := cli.hijack("POST", "/containers/"+cmd.Arg(0)+"/attach?logs=1&stdout=1", false, nil, cli.out); err != nil {
-		return err
-	}
-	if err := cli.hijack("POST", "/containers/"+cmd.Arg(0)+"/attach?logs=1&stderr=1", false, nil, cli.err); err != nil {
+	if err := cli.hijack("POST", "/containers/"+cmd.Arg(0)+"/attach?logs=1&stdout=1&stderr=1", false, nil, cli.out); err != nil {
 		return err
 	}
 	return nil
diff --git a/server.go b/server.go
index d275fe814b..958dc75663 100644
--- a/server.go
+++ b/server.go
@@ -1046,6 +1046,7 @@ func (srv *Server) ContainerAttach(name string, logs, stream, stdin, stdout, std
 		cLog, err := container.ReadLog("json")
 		if err != nil && os.IsNotExist(err) {
 			// Legacy logs
+			utils.Debugf("Old logs format")
 			if stdout {
 				cLog, err := container.ReadLog("stdout")
 				if err != nil {