logging + tweaks
Juan Batiz-Benet committed
Oct 13, 2014 at 01:31 UTC
4b5906e4668a4f323ad9c416d369685bd8c90a19
3 files changed
+12
-4
exchange/bitswap/bitswap.go
+1
@@ -85,6 +85,7 @@ func (bs *bitswap) Block(parent context.Context, k u.Key) (*blocks.Block, error)
85
log.Debug("bitswap got peersToQuery: %s", iiiii)
86
go func(p *peer.Peer) {
87
88
+ log.Debug("bitswap dialing peer: %s", p)
89
err := bs.sender.DialPeer(p)
90
if err != nil {
91
log.Error("Error sender.DialPeer(%s)", p)
routing/dht/dht.go
+2
-1
@@ -472,7 +472,7 @@ func (dht *IpfsDHT) peerFromInfo(pbp *Message_Peer) (*peer.Peer, error) {
472
}
473
474
if p == nil {
475
- maddr, err := ma.NewMultiaddr(pbp.GetAddr())
475
+ maddr, err := pbp.Address()
476
if err != nil {
477
return nil, err
478
}
@@ -481,6 +481,7 @@ func (dht *IpfsDHT) peerFromInfo(pbp *Message_Peer) (*peer.Peer, error) {
481
p = &peer.Peer{ID: id}
482
p.AddAddress(maddr)
483
dht.peerstore.Put(p)
484
+ log.Info("dht found new peer: %s %s", p, maddr)
485
}
486
return p, nil
487
}
routing/dht/handlers.go
+9
-3
@@ -176,19 +176,25 @@ func (dht *IpfsDHT) handleAddProvider(p *peer.Peer, pmes *Message) (*Message, er
176
log.Debug("%s adding %s as a provider for '%s'\n", dht.self, p, peer.ID(key))
177
178
// add provider should use the address given in the message
179
- for _, pb := range pmes.GetCloserPeers() {
180
- if peer.ID(pb.GetId()).Equal(p.ID) {
179
+ for _, pb := range pmes.GetProviderPeers() {
180
+ pid := peer.ID(pb.GetId())
181
+ if pid.Equal(p.ID) {
182
183
addr, err := pb.Address()
184
if err != nil {
185
log.Error("provider %s error with address %s", p, *pb.Addr)
186
continue
187
}
188
+
189
+ log.Info("received provider %s %s for %s", p, addr, key)
190
p.AddAddress(addr)
191
+ dht.providers.AddProvider(key, p)
192
+
193
+ } else {
194
+ log.Error("handleAddProvider received provider %s from %s", pid, p)
195
}
196
}
197
191
- dht.providers.AddProvider(key, p)
198
return pmes, nil // send back same msg as confirmation.
199
}
200