Merge pull request #467 from libp2p/fix/cleanup-goroutines

fix(query): cancel the context when the query finishes
libp2p · Feb 28, 2020 · 4838fd5 · 4838fd5
2 parents 30ba05e + e6a4d6a
commit 4838fd5
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/query.go b/query.go
@@ -125,6 +125,10 @@ func newQueryRunner(q *dhtQuery) *dhtQueryRunner {
 }
 
 func (r *dhtQueryRunner) Run(ctx context.Context, peers []peer.ID) (*dhtQueryResult, error) {
+	// Make sure to clean everything up when we return from this function.
+	ctx, cancel := context.WithCancel(ctx)
+	defer cancel()
+
 	r.log = logger
 	r.runCtx = ctx