dht-handlers-log-keys
Juan Batiz-Benet committed
Apr 2, 2015 at 03:02 UTC
d749930dfb6dd0d8bdb336ee36d5be57a5b97481
1 file changed
+11
-2
routing/dht/handlers.go
+11
-2
@@ -10,6 +10,7 @@ import (
10
peer "github.com/ipfs/go-ipfs/p2p/peer"
11
pb "github.com/ipfs/go-ipfs/routing/dht/pb"
12
u "github.com/ipfs/go-ipfs/util"
13
+ lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables"
14
)
15
16
// The number of closer peers to send on requests.
@@ -157,9 +158,13 @@ func (dht *IpfsDHT) handleFindPeer(ctx context.Context, p peer.ID, pmes *pb.Mess
158
}
159
160
func (dht *IpfsDHT) handleGetProviders(ctx context.Context, p peer.ID, pmes *pb.Message) (*pb.Message, error) {
160
- defer log.EventBegin(ctx, "handleGetProviders", p).Done()
161
+ lm := make(lgbl.DeferredMap)
162
+ lm["peer"] = func() interface{} { return p.Pretty() }
163
+ defer log.EventBegin(ctx, "handleGetProviders", lm).Done()
164
+
165
resp := pb.NewMessage(pmes.GetType(), pmes.GetKey(), pmes.GetClusterLevel())
166
key := u.Key(pmes.GetKey())
167
+ lm["key"] = func() interface{} { return key.Pretty() }
168
169
// debug logging niceness.
170
reqDesc := fmt.Sprintf("%s handleGetProviders(%s, %s): ", dht.self, p, key)
@@ -198,8 +203,12 @@ func (dht *IpfsDHT) handleGetProviders(ctx context.Context, p peer.ID, pmes *pb.
203
}
204
205
func (dht *IpfsDHT) handleAddProvider(ctx context.Context, p peer.ID, pmes *pb.Message) (*pb.Message, error) {
201
- defer log.EventBegin(ctx, "handleAddProvider", p).Done()
206
+ lm := make(lgbl.DeferredMap)
207
+ lm["peer"] = func() interface{} { return p.Pretty() }
208
+
209
+ defer log.EventBegin(ctx, "handleAddProvider", lm).Done()
210
key := u.Key(pmes.GetKey())
211
+ lm["key"] = func() interface{} { return key.Pretty() }
212
213
log.Debugf("%s adding %s as a provider for '%s'\n", dht.self, p, key)
214