Reduce the Destroy timeout from 10 to 3 seconds

This commit is contained in:
Guillaume J. Charmes 2013-05-09 21:53:56 -07:00
parent 483c942520
commit 28fd289b44
2 changed files with 2 additions and 1 deletions

View File

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

View File

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