p2p/net/swarm + conn: logs + debugerr output
Juan Batiz-Benet committed
Jan 22, 2015 at 18:07 UTC
1ec88740774313eac0e634af9499778ee92a308f
3 files changed
+5
-3
p2p/net/conn/conn.go
+2
-1
@@ -15,6 +15,7 @@ import (
15
peer "github.com/jbenet/go-ipfs/p2p/peer"
16
eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
17
u "github.com/jbenet/go-ipfs/util"
18
+ debugerr "github.com/jbenet/go-ipfs/util/debugerror"
19
)
20
21
var log = eventlog.Logger("conn")
@@ -50,7 +51,7 @@ func newSingleConn(ctx context.Context, local, remote peer.ID, maconn manet.Conn
51
52
// close is the internal close function, called by ContextCloser.Close
53
func (c *singleConn) Close() error {
53
- log.Debugf("%s closing Conn with %s", c.local, c.remote)
54
+ log.Debug(debugerr.Errorf("%s closing Conn with %s", c.local, c.remote))
55
// close underlying connection
56
return c.msgrw.Close()
57
}
p2p/net/conn/listen.go
+2
-1
@@ -75,6 +75,7 @@ func (l *listener) Accept() (net.Conn, error) {
75
return nil, err
76
}
77
78
+ log.Debugf("listener %s got connection: %s <---> %s", l, maconn.LocalMultiaddr(), maconn.RemoteMultiaddr())
79
c, err := newSingleConn(ctx, l.local, "", maconn)
80
if err != nil {
81
if catcher.IsTemporary(err) {
@@ -89,7 +90,7 @@ func (l *listener) Accept() (net.Conn, error) {
90
}
91
sc, err := newSecureConn(ctx, l.privk, c)
92
if err != nil {
92
- log.Info("ignoring conn we failed to secure: %s %s", err, sc)
93
+ log.Infof("ignoring conn we failed to secure: %s %s", err, c)
94
continue
95
}
96
return sc, nil
p2p/net/swarm/swarm_listen.go
+1
-1
@@ -65,7 +65,6 @@ func (s *Swarm) setupListener(maddr ma.Multiaddr) error {
65
if err != nil {
66
return err
67
}
68
- log.Infof("Swarm Listening at %s", s.ListenAddresses())
68
69
// AddListener to the peerstream Listener. this will begin accepting connections
70
// and streams!
@@ -73,6 +72,7 @@ func (s *Swarm) setupListener(maddr ma.Multiaddr) error {
72
if err != nil {
73
return err
74
}
75
+ log.Infof("Swarm Listeners at %s", s.ListenAddresses())
76
77
// go consume peerstream's listen accept errors. note, these ARE errors.
78
// they may be killing the listener, and if we get _any_ we should be