GitList

Browse code

Reduce the Destroy timeout from 10 to 3 seconds

Guillaume J. Charmes authored on 2013/05/10 13:53:56
Showing 2 changed files

runtime.go index 7db3b40..f2914db 100644
server.go index cd4771f..3e95d58 100644

@@ -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 {

server.go

History View file @ 28fd289

@@ -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 {

...	...	@@ -187,7 +187,7 @@ func (runtime Runtime) Destroy(container Container) error {
187	187	return fmt.Errorf("Container %v not found - maybe it was already destroyed?", container.Id)
188	188	}
189	189
190		- if err := container.Stop(10); err != nil {
	190	+ if err := container.Stop(3); err != nil {
191	191	return err
192	192	}
193	193	if mounted, err := container.Mounted(); err != nil {