log(bitswap): clean up
Brian Tiger Chow committed
Jan 20, 2015 at 02:42 UTC
7e90fa95c929c45e41f595852a863530c8fec60b
1 file changed
-9
exchange/bitswap/bitswap.go
-9
@@ -169,20 +169,14 @@ func (bs *bitswap) HasBlock(ctx context.Context, blk *blocks.Block) error {
169
}
170
171
func (bs *bitswap) sendWantlistMsgToPeers(ctx context.Context, m bsmsg.BitSwapMessage, peers <-chan peer.ID) error {
172
- if peers == nil {
173
- panic("Cant send wantlist to nil peerchan")
174
- }
175
-
172
set := pset.New()
173
wg := sync.WaitGroup{}
174
for peerToQuery := range peers {
175
log.Event(ctx, "PeerToQuery", peerToQuery)
176
177
if !set.TryAdd(peerToQuery) { //Do once per peer
182
- log.Debugf("%s skipped (already sent)", peerToQuery)
178
continue
179
}
185
- log.Debugf("%s sending", peerToQuery)
180
181
wg.Add(1)
182
go func(p peer.ID) {
@@ -228,7 +222,6 @@ func (bs *bitswap) sendWantlistToProviders(ctx context.Context) {
222
child, _ := context.WithTimeout(ctx, providerRequestTimeout)
223
providers := bs.network.FindProvidersAsync(child, k, maxProvidersPerRequest)
224
for prov := range providers {
231
- log.Debugf("dht returned provider %s. send wantlist", prov)
225
sendToPeers <- prov
226
}
227
}(e.Key)
@@ -249,7 +242,6 @@ func (bs *bitswap) taskWorker(ctx context.Context) {
242
for {
243
select {
244
case <-ctx.Done():
252
- log.Debugf("exiting")
245
return
246
case nextEnvelope := <-bs.engine.Outbox():
247
select {
@@ -304,7 +296,6 @@ func (bs *bitswap) clientWorker(parent context.Context) {
296
// TODO(brian): handle errors
297
func (bs *bitswap) ReceiveMessage(ctx context.Context, p peer.ID, incoming bsmsg.BitSwapMessage) (
298
peer.ID, bsmsg.BitSwapMessage) {
307
- log.Debugf("ReceiveMessage from %s", p)
299
300
if p == "" {
301
log.Error("Received message from nil peer!")