Merge pull request #1014 from weaveworks/977-docker-event-crash

Handle closing of docker events channel gracefully
weaveworks · Feb 24, 2016 · fbe5671 · fbe5671
2 parents 6b9daa7 + 2982166
commit fbe5671
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/probe/docker/registry.go b/probe/docker/registry.go
@@ -161,7 +161,11 @@ func (r *registry) listenForEvents() bool {
 	otherUpdates := time.Tick(r.interval)
 	for {
 		select {
-		case event := <-events:
+		case event, ok := <-events:
+			if !ok {
+				log.Errorf("docker registry: event listener unexpectedly disconnected")
+				return true
+			}
 			r.handleEvent(event)
 
 		case <-otherUpdates: