From 81e7c2b84ecc86a6dbd30610ccc77ccdb3e18a6d Mon Sep 17 00:00:00 2001 From: Juan Batiz-Benet Date: Fri, 30 Jan 2015 22:35:06 -0800 Subject: [PATCH] log(secio): session loggable for event --- p2p/crypto/secio/protocol.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/p2p/crypto/secio/protocol.go b/p2p/crypto/secio/protocol.go index 4dc64155f..9f90dc952 100644 --- a/p2p/crypto/secio/protocol.go +++ b/p2p/crypto/secio/protocol.go @@ -46,6 +46,14 @@ type secureSession struct { sharedSecret []byte } +func (s *secureSession) Loggable() map[string]interface{} { + m := make(map[string]interface{}) + m["localPeer"] = s.localPeer.Pretty() + m["remotePeer"] = s.remotePeer.Pretty() + m["established"] = (s.secure != nil) + return m +} + func newSecureSession(local peer.ID, key ci.PrivKey) (*secureSession, error) { s := &secureSession{localPeer: local, localKey: key} @@ -80,7 +88,7 @@ func (s *secureSession) handshake(ctx context.Context, insecure io.ReadWriter) e return err } - defer log.EventBegin(ctx, "secureHandshake", s.localPeer).Done() + defer log.EventBegin(ctx, "secureHandshake", s).Done() s.local.permanentPubKey = s.localKey.GetPublic() myPubKeyBytes, err := s.local.permanentPubKey.Bytes() @@ -292,6 +300,5 @@ func (s *secureSession) handshake(ctx context.Context, insecure io.ReadWriter) e } // Whew! ok, that's all folks. - log.Event(ctx, "secureHandshakeFinish", s.localPeer, s.remotePeer) return nil }