kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Reduce the Destroy timeout from 10 to 3 seconds

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
runtime.go
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) 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 return err
} }
if mounted, err := container.Mounted(); err != nil { if mounted, err := container.Mounted(); err != nil {

1
server.go
View file

@ -497,6 +497,7 @@ func (srv *Server) ContainerAttach(name string, logs, stream, stdin, stdout, std
if container == nil { if container == nil {
return fmt.Errorf("No such container: %s", name) return fmt.Errorf("No such container: %s", name)
} }
//logs //logs
if logs { if logs {
if stdout { if stdout {