Merge pull request #248 from raulk/master

Fix a race in dial queue
libp2p · Feb 1, 2019 · ad151c1 · ad151c1
2 parents ebcfcd4 + 94682b4
commit ad151c1
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/dial_queue.go b/dial_queue.go
@@ -208,9 +208,11 @@ func (dq *dialQueue) Consume() <-chan peer.ID {
 	ch := make(chan peer.ID, 1)
 
 	select {
-	case p := <-dq.out.DeqChan:
-		// short circuit and return a dialled peer if it's immediately available.
-		ch <- p
+	case p, ok := <-dq.out.DeqChan:
+		// short circuit and return a dialled peer if it's immediately available, or abort if DeqChan is closed.
+		if ok {
+			ch <- p
+		}
 		close(ch)
 		return ch
 	case <-dq.ctx.Done():