bitswap: clean log printf and humanize dup data count
License: MIT Signed-off-by: Henry <cryptix@riseup.net>
Henry committed
Oct 23, 2015 at 08:26 UTC
aeeed0c72b507599ad5f0de811064dab82322456
2 files changed
+4
-2
core/commands/bitswap.go
+3
-1
@@ -5,6 +5,8 @@ import (
5
"fmt"
6
"io"
7
8
+ "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/dustin/go-humanize"
9
+
10
key "github.com/ipfs/go-ipfs/blocks/key"
11
cmds "github.com/ipfs/go-ipfs/commands"
12
bitswap "github.com/ipfs/go-ipfs/exchange/bitswap"
@@ -156,7 +158,7 @@ var bitswapStatCmd = &cmds.Command{
158
fmt.Fprintf(buf, "\tprovides buffer: %d / %d\n", out.ProvideBufLen, bitswap.HasBlockBufferSize)
159
fmt.Fprintf(buf, "\tblocks received: %d\n", out.BlocksReceived)
160
fmt.Fprintf(buf, "\tdup blocks received: %d\n", out.DupBlksReceived)
159
- fmt.Fprintf(buf, "\tdup data received: %d\n", out.DupDataReceived)
161
+ fmt.Fprintf(buf, "\tdup data received: %s\n", humanize.Bytes(out.DupDataReceived))
162
fmt.Fprintf(buf, "\twantlist [%d keys]\n", len(out.Wantlist))
163
for _, k := range out.Wantlist {
164
fmt.Fprintf(buf, "\t\t%s\n", k.B58String())
exchange/bitswap/bitswap.go
+1
-1
@@ -308,7 +308,7 @@ func (bs *Bitswap) ReceiveMessage(ctx context.Context, p peer.ID, incoming bsmsg
308
var keys []key.Key
309
for _, block := range iblocks {
310
if _, found := bs.wm.wl.Contains(block.Key()); !found {
311
- log.Info("received un-asked-for block: %s", block)
311
+ log.Infof("received un-asked-for %s from %s", block, p)
312
continue
313
}
314
keys = append(keys, block.Key())