opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-26 15:42:21 +08:00
Code Issues Projects Releases Wiki Activity

fixed two more

Browse Source
This commit is contained in:
Henry
2015-03-07 11:47:19 +01:00
parent 435e8188a3
commit aa55eebe7e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
exchange/bitswap/workers.go
View File

@ -68,11 +68,12 @@ func (bs *Bitswap) provideWorker(ctx context.Context) {
log.Debug("provideKeys channel closed") log.Debug("provideKeys channel closed")
return return
} }
ctx, _ := context.WithTimeout(ctx, provideTimeout) ctx, cancel := context.WithTimeout(ctx, provideTimeout)
err := bs.network.Provide(ctx, k) err := bs.network.Provide(ctx, k)
if err != nil { if err != nil {
log.Error(err) log.Error(err)
} }
cancel()
case <-ctx.Done(): case <-ctx.Done():
return return
} }
@ -136,12 +137,13 @@ func (bs *Bitswap) clientWorker(parent context.Context) {
// NB: Optimization. Assumes that providers of key[0] are likely to // NB: Optimization. Assumes that providers of key[0] are likely to
// be able to provide for all keys. This currently holds true in most // be able to provide for all keys. This currently holds true in most
// every situation. Later, this assumption may not hold as true. // every situation. Later, this assumption may not hold as true.
child, _ := context.WithTimeout(req.ctx, providerRequestTimeout) child, cancel := context.WithTimeout(req.ctx, providerRequestTimeout)
providers := bs.network.FindProvidersAsync(child, keys[0], maxProvidersPerRequest) providers := bs.network.FindProvidersAsync(child, keys[0], maxProvidersPerRequest)
err := bs.sendWantlistToPeers(req.ctx, providers) err := bs.sendWantlistToPeers(req.ctx, providers)
if err != nil { if err != nil {
log.Debugf("error sending wantlist: %s", err) log.Debugf("error sending wantlist: %s", err)
} }
cancel()
// Wait for wantNewBlocks to finish // Wait for wantNewBlocks to finish
<-done <-done