added log.Events to secio
Juan Batiz-Benet committed
Dec 12, 2014 at 03:23 UTC
e7edeca39254615c3b54a8d0f61d8b7434e706c5
2 files changed
+6
-3
cmd/seccat/util.go
+2
-2
@@ -5,10 +5,10 @@ import (
5
"io"
6
"os"
7
8
- u "github.com/jbenet/go-ipfs/util"
8
+ eventlog "github.com/jbenet/go-ipfs/util/eventlog"
9
)
10
11
-var log = u.Logger("seccat")
11
+var log = eventlog.Logger("seccat")
12
13
func exit(format string, vals ...interface{}) {
14
if format != "" {
crypto/secio/protocol.go
+4
-1
@@ -14,9 +14,10 @@ import (
14
pb "github.com/jbenet/go-ipfs/crypto/spipe/internal/pb"
15
peer "github.com/jbenet/go-ipfs/peer"
16
u "github.com/jbenet/go-ipfs/util"
17
+ eventlog "github.com/jbenet/go-ipfs/util/eventlog"
18
)
19
19
-var log = u.Logger("spipe")
20
+var log = eventlog.Logger("secio")
21
22
// ErrUnsupportedKeyType is returned when a private key cast/type switch fails.
23
var ErrUnsupportedKeyType = errors.New("unsupported key type")
@@ -69,6 +70,7 @@ func (s *secureSession) handshake(ctx context.Context, insecure io.ReadWriter) e
70
}
71
72
log.Debugf("handshake: %s <--start--> %s", s.localPeer, s.remotePeer)
73
+ log.Event(ctx, "secureHandshakeStart", s.localPeer)
74
s.local.permanentPubKey = s.localPeer.PubKey()
75
myPubKeyBytes, err := s.local.permanentPubKey.Bytes()
76
if err != nil {
@@ -256,6 +258,7 @@ func (s *secureSession) handshake(ctx context.Context, insecure io.ReadWriter) e
258
259
// Whew! ok, that's all folks.
260
log.Debugf("handshake: %s <--finish--> %s", s.localPeer, s.remotePeer)
261
+ log.Event(ctx, "secureHandshakeFinish", s.localPeer, s.remotePeer)
262
return nil
263
}
264