toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Fix die command when monitor returns
Upstream-commit: cb33f739a19ca4382499aaa9f50bd4a031ba0cbe
Component: engine
This commit is contained in:
Guillaume J. Charmes
2014-01-21 17:13:29 -08:00
parent 5bf17309b9 003b985961
commit fe22aca6b8
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/container.go
+5 -3
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.