Merge pull request #3353 from ipfs/fix/diag-hang

respect contexts when returning diagnostics responses
ipfs · Nov 4, 2016 · 4b82c89 · 4b82c89
2 parents a9df187 + 7728124
commit 4b82c89
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/diagnostics/diag.go b/diagnostics/diag.go
@@ -191,7 +191,11 @@ func (d *Diagnostics) getDiagnosticFromPeers(ctx context.Context, peers map[peer
 				return
 			}
 			for d := range out {
-				respdata <- d
+				select {
+				case respdata <- d:
+				case <-ctx.Done():
+					return
+				}
 			}
 		}(p)
 	}