Sfoglia il codice sorgente

Fix race causing autorestart turning off on restart

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Tonis Tiigi 9 anni fa
parent
commit
b8aaa4b07c
1 ha cambiato i file con 1 aggiunte e 1 eliminazioni
  1. 1 1
      daemon/container.go

+ 1 - 1
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
 		}
 	}