From 80f128a6ea2b71e2ed6838c6a913086859ed50ff Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Tue, 21 Jan 2014 16:18:57 -0800 Subject: [PATCH] Fix die command when monitor returns Docker-DCO-1.1-Signed-off-by: Michael Crosby (github: crosbymichael) --- container.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/container.go b/container.go index 4f7f03d454..a3fb5d6b39 100644 --- a/container.go +++ b/container.go @@ -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.