Merge pull request #1989 from weaveworks/1977-restarting-not-running

treat 'restarting' as 'not running'
weaveworks · Feb 23, 2016 · 639e0e8 · 639e0e8
2 parents 4b0a6e1 + 4a71579
commit 639e0e8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/common/docker/client.go b/common/docker/client.go
@@ -97,7 +97,7 @@ func (c *Client) AddObserver(ob ContainerObserver) error {
 func (c *Client) IsContainerNotRunning(idStr string) bool {
 	container, err := c.InspectContainer(idStr)
 	if err == nil {
-		return !container.State.Running
+		return !container.State.Running || container.State.Restarting
 	}
 	if _, notThere := err.(*docker.NoSuchContainer); notThere {
 		return true

diff --git a/proxy/proxy.go b/proxy/proxy.go
@@ -132,7 +132,7 @@ func (proxy *Proxy) AttachExistingContainers() {
 			}
 			continue
 		}
-		if containerShouldAttach(container) && (container.State.Running || container.State.Paused) {
+		if containerShouldAttach(container) && container.State.Running && !container.State.Restarting {
 			proxy.attach(container, false)
 		}
 	}