From 28fd289b448164b77affd8103c0d96fd8110daf9 Mon Sep 17 00:00:00 2001
From: "Guillaume J. Charmes" <guillaume.charmes@dotcloud.com>
Date: Thu, 9 May 2013 21:53:56 -0700
Subject: [PATCH] Reduce the Destroy timeout from 10 to 3 seconds

---
 runtime.go | 2 +-
 server.go  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/runtime.go b/runtime.go
index 7db3b40325..f2914dba21 100644
--- a/runtime.go
+++ b/runtime.go
@@ -187,7 +187,7 @@ func (runtime *Runtime) Destroy(container *Container) error {
 		return fmt.Errorf("Container %v not found - maybe it was already destroyed?", container.Id)
 	}
 
-	if err := container.Stop(10); err != nil {
+	if err := container.Stop(3); err != nil {
 		return err
 	}
 	if mounted, err := container.Mounted(); err != nil {
diff --git a/server.go b/server.go
index cd4771f412..3e95d5849d 100644
--- a/server.go
+++ b/server.go
@@ -497,6 +497,7 @@ func (srv *Server) ContainerAttach(name string, logs, stream, stdin, stdout, std
 	if container == nil {
 		return fmt.Errorf("No such container: %s", name)
 	}
+
 	//logs
 	if logs {
 		if stdout {