Merge pull request #1099 from cockroachdb/pmattis/localcluster-monitor

Fix processing of monitoring events.
cockroachdb · May 21, 2015 · c7ec260 · c7ec260
2 parents bcecfb6 + 23802e9
commit c7ec260
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/acceptance/localcluster/localcluster.go b/acceptance/localcluster/localcluster.go
@@ -335,14 +335,15 @@ func (l *Cluster) processEvent(e dockerclient.EventOrError) bool {
 	default:
 		// There is a very tiny race here: the signal handler might be closing the
 		// stopper simultaneously.
+		log.Errorf("stopping due to unexpected event: %+v", e)
 		close(l.stopper)
 	}
 	return false
 }
 
 func (l *Cluster) monitor(ch <-chan dockerclient.EventOrError) {
-	for {
-		if !l.processEvent(<-ch) {
+	for e := range ch {
+		if !l.processEvent(e) {
 			break
 		}
 	}