Merge pull request #1367 from ipfs/wantmanager-cleanup

select with context when sending on channels

Merge pull request #1367 from ipfs/wantmanager-cleanup
select with context when sending on channels
848502de · Juan Batiz-Benet · 41785f3b · b12cc09f · 848502de
Commit 848502de authored Jun 12, 2015 by Juan Batiz-Benet
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

exchange/bitswap/wantmanager.go exchange/bitswap/wantmanager.go +8 -2

No files found.
--- a/exchange/bitswap/wantmanager.go
+++ b/exchange/bitswap/wantmanager.go
@@ -181,11 +181,17 @@ func (mq *msgQueue) doWork(ctx context.Context) {
 }

 func (pm *WantManager) Connected(p peer.ID) {
-	pm.connect <- p
+	select {
+	case pm.connect <- p:
+	case <-pm.ctx.Done():
+	}
 }

 func (pm *WantManager) Disconnected(p peer.ID) {
-	pm.disconnect <- p
+	select {
+	case pm.disconnect <- p:
+	case <-pm.ctx.Done():
+	}
 }

 // TODO: use goprocess here once i trust it