From c273a3bd4f616cb95cebb1cf0b4b665bac8a6d39 Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Sun, 17 May 2015 17:09:53 -0700
Subject: [PATCH] better bitswap logging
---
exchange/bitswap/bitswap.go | 2 +-
exchange/bitswap/wantmanager.go | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/exchange/bitswap/bitswap.go b/exchange/bitswap/bitswap.go
index 57359c0ec..db7bc033f 100644
--- a/exchange/bitswap/bitswap.go
+++ b/exchange/bitswap/bitswap.go
@@ -288,7 +288,7 @@ func (bs *Bitswap) ReceiveMessage(ctx context.Context, p peer.ID, incoming bsmsg
bs.dupBlocksRecvd++
}
bs.counterLk.Unlock()
- log.Debugf("got block %s from %s (%d,%d)", block, p, bs.blocksRecvd, bs.dupBlocksRecvd)
+ log.Infof("got block %s from %s (%d,%d)", block, p, bs.blocksRecvd, bs.dupBlocksRecvd)
hasBlockCtx, cancel := context.WithTimeout(ctx, hasBlockTimeout)
if err := bs.HasBlock(hasBlockCtx, block); err != nil {
diff --git a/exchange/bitswap/wantmanager.go b/exchange/bitswap/wantmanager.go
index eb49201a6..74372f7f0 100644
--- a/exchange/bitswap/wantmanager.go
+++ b/exchange/bitswap/wantmanager.go
@@ -66,6 +66,7 @@ type msgQueue struct {
}
func (pm *WantManager) WantBlocks(ks []u.Key) {
+ log.Infof("want blocks: %s", ks)
pm.addEntries(ks, false)
}
@@ -97,6 +98,7 @@ func (pm *WantManager) SendBlock(ctx context.Context, env *engine.Envelope) {
msg := bsmsg.New(false)
msg.AddBlock(env.Block)
+ log.Infof("Sending block %s to %s", env.Peer, env.Block)
err := pm.network.SendMessage(ctx, env.Peer, msg)
if err != nil {
log.Error(err)
@@ -143,8 +145,9 @@ func (pm *WantManager) runQueue(mq *msgQueue) {
err := pm.network.ConnectTo(pm.ctx, mq.p)
if err != nil {
- log.Error(err)
+ log.Errorf("cant connect to peer %s: %s", mq.p, err)
// TODO: cant connect, what now?
+ continue
}
// grab outgoing message
--
GitLab