From 0d9e54367f7bf7da9670de723d533eaa920868c8 Mon Sep 17 00:00:00 2001 From: "Guillaume J. Charmes" Date: Tue, 9 Apr 2013 12:06:01 -0700 Subject: [PATCH] Fix deadlock on stop failure --- container.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container.go b/container.go index a7a4de5563..e5b2d0af48 100644 --- a/container.go +++ b/container.go @@ -579,7 +579,7 @@ func (container *Container) Stop() error { // 2. Wait for the process to exit on its own if err := container.WaitTimeout(10 * time.Second); err != nil { log.Printf("Container %v failed to exit within 10 seconds of SIGTERM - using the force", container.Id) - if err := container.Kill(); err != nil { + if err := container.kill(); err != nil { return err } }