From b8aaa4b07c100a338136be82292289a37b09b5e7 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Mon, 2 Nov 2015 13:51:55 -0800 Subject: [PATCH] Fix race causing autorestart turning off on restart Signed-off-by: Tonis Tiigi --- daemon/container.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/container.go b/daemon/container.go index f6250d37d9..7849a9fb5f 100644 --- a/daemon/container.go +++ b/daemon/container.go @@ -503,7 +503,7 @@ func (container *Container) Stop(seconds int) error { // 3. If it doesn't, then send SIGKILL if err := container.Kill(); err != nil { container.WaitStop(-1 * time.Second) - return err + logrus.Warn(err) // Don't return error because we only care that container is stopped, not what function stopped it } }