0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3705 from crosbymichael/fix-die-event

Browse source 
Fix die command when monitor returns
This commit is contained in:
Guillaume J. Charmes 2014-01-21 17:13:29 -08:00
commit cb33f739a1
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
container.go
View file

@ -1141,9 +1141,7 @@ func (container *Container) monitor(callback execdriver.StartCallback) error {
}
if err != nil {
if container.runtime != nil && container.runtime.srv != nil {
container.runtime.srv.LogEvent("die", container.ID, container.runtime.repositories.ImageName(container.Image))
}
utils.Errorf("Error running container: %s", err)
}
// Cleanup
@ -1156,6 +1154,10 @@ func (container *Container) monitor(callback execdriver.StartCallback) error {
container.State.SetStopped(exitCode)
if container.runtime != nil && container.runtime.srv != nil {
container.runtime.srv.LogEvent("die", container.ID, container.runtime.repositories.ImageName(container.Image))
}
close(container.waitLock)
// FIXME: there is a race condition here which causes this to fail during the unit tests.