rewrite as single line defer logs
Jeromy committed
Jan 15, 2015 at 04:45 UTC
3c55902811fdb25455ded17981f40932922f8c4a
4 files changed
+8
-16
exchange/bitswap/bitswap.go
+1
-2
@@ -120,12 +120,11 @@ func (bs *bitswap) GetBlock(parent context.Context, k u.Key) (*blocks.Block, err
120
ctx, cancelFunc := context.WithCancel(parent)
121
122
ctx = eventlog.ContextWithLoggable(ctx, eventlog.Uuid("GetBlockRequest"))
123
- e := log.EventBegin(ctx, "GetBlockRequest", &k)
123
+ defer log.EventBegin(ctx, "GetBlockRequest", &k).Done()
124
log.Debugf("GetBlockRequestBegin")
125
126
defer func() {
127
cancelFunc()
128
- e.Done()
128
log.Debugf("GetBlockRequestEnd")
129
}()
130
p2p/crypto/secio/protocol.go
+1
-2
@@ -81,8 +81,7 @@ func (s *secureSession) handshake(ctx context.Context, insecure io.ReadWriter) e
81
}
82
83
log.Debugf("handshake: %s <--start--> %s", s.localPeer, s.remotePeer)
84
- e := log.EventBegin(ctx, "secureHandshake", s.localPeer)
85
- defer e.Done()
84
+ defer log.EventBegin(ctx, "secureHandshake", s.localPeer).Done()
85
86
s.local.permanentPubKey = s.localKey.GetPublic()
87
myPubKeyBytes, err := s.local.permanentPubKey.Bytes()
routing/dht/dht.go
+3
-6
@@ -196,8 +196,7 @@ func (dht *IpfsDHT) getValueOrPeers(ctx context.Context, p peer.ID,
196
// getValueSingle simply performs the get value RPC with the given parameters
197
func (dht *IpfsDHT) getValueSingle(ctx context.Context, p peer.ID,
198
key u.Key) (*pb.Message, error) {
199
- e := log.EventBegin(ctx, "getValueSingle", p, &key)
200
- defer e.Done()
199
+ defer log.EventBegin(ctx, "getValueSingle", p, &key).Done()
200
201
pmes := pb.NewMessage(pb.Message_GET_VALUE, string(key), 0)
202
return dht.sendRequest(ctx, p, pmes)
@@ -267,16 +266,14 @@ func (dht *IpfsDHT) FindLocal(id peer.ID) peer.PeerInfo {
266
267
// findPeerSingle asks peer 'p' if they know where the peer with id 'id' is
268
func (dht *IpfsDHT) findPeerSingle(ctx context.Context, p peer.ID, id peer.ID) (*pb.Message, error) {
270
- e := log.EventBegin(ctx, "findPeerSingle", p, id)
271
- defer e.Done()
269
+ defer log.EventBegin(ctx, "findPeerSingle", p, id).Done()
270
271
pmes := pb.NewMessage(pb.Message_FIND_NODE, string(id), 0)
272
return dht.sendRequest(ctx, p, pmes)
273
}
274
275
func (dht *IpfsDHT) findProvidersSingle(ctx context.Context, p peer.ID, key u.Key) (*pb.Message, error) {
278
- e := log.EventBegin(ctx, "findProvidersSingle", p, &key)
279
- defer e.Done()
276
+ defer log.EventBegin(ctx, "findProvidersSingle", p, &key).Done()
277
278
pmes := pb.NewMessage(pb.Message_GET_PROVIDERS, string(key), 0)
279
return dht.sendRequest(ctx, p, pmes)
routing/dht/routing.go
+3
-6
@@ -126,8 +126,7 @@ func (dht *IpfsDHT) Provide(ctx context.Context, key u.Key) error {
126
log.Debugf("start", key)
127
defer log.Debugf("end", key)
128
129
- e := log.EventBegin(ctx, "provide", &key)
130
- defer e.Done()
129
+ defer log.EventBegin(ctx, "provide", &key).Done()
130
131
// add self locally
132
dht.providers.AddProvider(key, dht.self)
@@ -246,8 +245,7 @@ func (dht *IpfsDHT) FindProvidersAsync(ctx context.Context, key u.Key, count int
245
func (dht *IpfsDHT) findProvidersAsyncRoutine(ctx context.Context, key u.Key, count int, peerOut chan peer.PeerInfo) {
246
log := dht.log().Prefix("FindProviders(%s)", key)
247
249
- e := log.EventBegin(ctx, "findProvidersAsync", &key)
250
- defer e.Done()
248
+ defer log.EventBegin(ctx, "findProvidersAsync", &key).Done()
249
defer close(peerOut)
250
251
ps := pset.NewLimited(count)
@@ -317,8 +315,7 @@ func (dht *IpfsDHT) findProvidersAsyncRoutine(ctx context.Context, key u.Key, co
315
316
// FindPeer searches for a peer with given ID.
317
func (dht *IpfsDHT) FindPeer(ctx context.Context, id peer.ID) (peer.PeerInfo, error) {
320
- e := log.EventBegin(ctx, "FindPeer", id)
321
- defer e.Done()
318
+ defer log.EventBegin(ctx, "FindPeer", id).Done()
319
320
// Check if were already connected to them
321
if pi := dht.FindLocal(id); pi.ID != "" {