Merge pull request #1568 from ipfs/fix/dht-commands

use correct context for dht notifs
ipfs · Aug 17, 2015 · 49dab68 · 49dab68
2 parents e10e711 + 64102a5
commit 49dab68
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/routing/dht/lookup.go b/routing/dht/lookup.go
@@ -40,9 +40,12 @@ func (dht *IpfsDHT) GetClosestPeers(ctx context.Context, key key.Key) (<-chan pe
  peerset.Add(p)
  }
 
+ // since the query doesnt actually pass our context down
+ // we have to hack this here. whyrusleeping isnt a huge fan of goprocess
+ parent := ctx
  query := dht.newQuery(key, func(ctx context.Context, p peer.ID) (*dhtQueryResult, error) {
  // For DHT query command
- notif.PublishQueryEvent(ctx, &notif.QueryEvent{
+ notif.PublishQueryEvent(parent, &notif.QueryEvent{
  Type: notif.SendingQuery,
  ID: p,
  })
@@ -66,7 +69,7 @@ func (dht *IpfsDHT) GetClosestPeers(ctx context.Context, key key.Key) (<-chan pe
  }
 
  // For DHT query command
- notif.PublishQueryEvent(ctx, &notif.QueryEvent{
+ notif.PublishQueryEvent(parent, &notif.QueryEvent{
  Type: notif.PeerResponse,
  ID: p,
  Responses: pointerizePeerInfos(filtered),

diff --git a/routing/dht/routing.go b/routing/dht/routing.go
@@ -97,8 +97,9 @@ func (dht *IpfsDHT) GetValue(ctx context.Context, key key.Key) ([]byte, error) {
  }
 
  // setup the Query
+ parent := ctx
  query := dht.newQuery(key, func(ctx context.Context, p peer.ID) (*dhtQueryResult, error) {
- notif.PublishQueryEvent(ctx, &notif.QueryEvent{
+ notif.PublishQueryEvent(parent, &notif.QueryEvent{
  Type: notif.SendingQuery,
  ID: p,
  })
@@ -113,7 +114,7 @@ func (dht *IpfsDHT) GetValue(ctx context.Context, key key.Key) ([]byte, error) {
  res.success = true
  }
 
- notif.PublishQueryEvent(ctx, &notif.QueryEvent{
+ notif.PublishQueryEvent(parent, &notif.QueryEvent{
  Type: notif.PeerResponse,
  ID: p,
  Responses: pointerizePeerInfos(peers),
@@ -209,8 +210,9 @@ func (dht *IpfsDHT) findProvidersAsyncRoutine(ctx context.Context, key key.Key,
  }
 
  // setup the Query
+ parent := ctx
  query := dht.newQuery(key, func(ctx context.Context, p peer.ID) (*dhtQueryResult, error) {
- notif.PublishQueryEvent(ctx, &notif.QueryEvent{
+ notif.PublishQueryEvent(parent, &notif.QueryEvent{
  Type: notif.SendingQuery,
  ID: p,
  })
@@ -246,7 +248,7 @@ func (dht *IpfsDHT) findProvidersAsyncRoutine(ctx context.Context, key key.Key,
  clpeers := pb.PBPeersToPeerInfos(closer)
  log.Debugf("got closer peers: %d %s", len(clpeers), clpeers)
 
- notif.PublishQueryEvent(ctx, &notif.QueryEvent{
+ notif.PublishQueryEvent(parent, &notif.QueryEvent{
  Type: notif.PeerResponse,
  ID: p,
  Responses: pointerizePeerInfos(clpeers),
@@ -288,8 +290,9 @@ func (dht *IpfsDHT) FindPeer(ctx context.Context, id peer.ID) (peer.PeerInfo, er
  }
 
  // setup the Query
+ parent := ctx
  query := dht.newQuery(key.Key(id), func(ctx context.Context, p peer.ID) (*dhtQueryResult, error) {
- notif.PublishQueryEvent(ctx, &notif.QueryEvent{
+ notif.PublishQueryEvent(parent, &notif.QueryEvent{
  Type: notif.SendingQuery,
  ID: p,
  })
@@ -312,7 +315,7 @@ func (dht *IpfsDHT) FindPeer(ctx context.Context, id peer.ID) (peer.PeerInfo, er
  }
  }
 
- notif.PublishQueryEvent(ctx, &notif.QueryEvent{
+ notif.PublishQueryEvent(parent, &notif.QueryEvent{
  Type: notif.PeerResponse,
  Responses: pointerizePeerInfos(clpeerInfos),
  })