Merge pull request openshift#41 from rajatchopra/master

return if error is a stop by user event
danwinship · Mar 9, 2015 · b0ebf57 · b0ebf57
2 parents b3705e7 + 48efe01
commit b0ebf57
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/pkg/registry/registry.go b/pkg/registry/registry.go
@@ -315,6 +315,10 @@ func (sub *EtcdSubnetRegistry) WatchMinions(rev uint64, receiver chan *MinionEve
 	log.Infof("Watching %s for new minions.", key)
 	for {
 		resp, err := sub.watch(key, rev, stop)
+		if err != nil && err == etcd.ErrWatchStoppedByUser {
+			log.Infof("New subnet event error: %v", err)
+			return err
+		}
 		if resp == nil || err != nil {
 			continue
 		}