GitList

Browse code

Fix race causing autorestart turning off on restart

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>

Tonis Tiigi authored on 2015/11/03 06:51:55
Showing 1 changed files

daemon/container.go index f6250d3..7849a9f 100644

@@ -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
 		}
 	}
 

...	...	@@ -503,7 +503,7 @@ func (container *Container) Stop(seconds int) error {
503	503	// 3. If it doesn't, then send SIGKILL
504	504	if err := container.Kill(); err != nil {
505	505	container.WaitStop(-1 * time.Second)
506		- return err
	506	+ logrus.Warn(err) // Don't return error because we only care that container is stopped, not what function stopped it
507	507	}
508	508	}
509	509