aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Lange <fjl@twurst.com>2015-05-07 05:19:14 +0800
committerFelix Lange <fjl@twurst.com>2015-05-07 05:19:14 +0800
commit6a2fec5309e14df6b5fcd0fb76d5b123565d40d4 (patch)
tree4d3cf815e5b3ba2a9603825cef3bbd052f3b69b0
parentbcfd7886619c9bc16f523f89ddd012cb53aa7159 (diff)
downloaddexon-6a2fec5309e14df6b5fcd0fb76d5b123565d40d4.tar
dexon-6a2fec5309e14df6b5fcd0fb76d5b123565d40d4.tar.gz
dexon-6a2fec5309e14df6b5fcd0fb76d5b123565d40d4.tar.bz2
dexon-6a2fec5309e14df6b5fcd0fb76d5b123565d40d4.tar.lz
dexon-6a2fec5309e14df6b5fcd0fb76d5b123565d40d4.tar.xz
dexon-6a2fec5309e14df6b5fcd0fb76d5b123565d40d4.tar.zst
dexon-6a2fec5309e14df6b5fcd0fb76d5b123565d40d4.zip
p2p, whisper: use glog for peer-level logging
-rw-r--r--p2p/peer.go21
-rw-r--r--whisper/peer.go11
-rw-r--r--whisper/whisper.go4
3 files changed, 16 insertions, 20 deletions
diff --git a/p2p/peer.go b/p2p/peer.go
index 94fa03f8d..cdf9ba965 100644
--- a/p2p/peer.go
+++ b/p2p/peer.go
@@ -10,6 +10,7 @@ import (
"time"
"github.com/ethereum/go-ethereum/logger"
+ "github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/p2p/discover"
"github.com/ethereum/go-ethereum/rlp"
)
@@ -34,10 +35,6 @@ const (
// Peer represents a connected remote node.
type Peer struct {
- // Peers have all the log methods.
- // Use them to display messages related to the peer.
- *logger.Logger
-
conn net.Conn
rw *conn
running map[string]*protoRW
@@ -99,10 +96,8 @@ func (p *Peer) String() string {
}
func newPeer(fd net.Conn, conn *conn, protocols []Protocol) *Peer {
- logtag := fmt.Sprintf("Peer %.8x %v", conn.ID[:], fd.RemoteAddr())
protomap := matchProtocols(protocols, conn.Caps, conn)
p := &Peer{
- Logger: logger.NewLogger(logtag),
conn: fd,
rw: conn,
running: protomap,
@@ -130,7 +125,7 @@ func (p *Peer) run() DiscReason {
} else {
// Note: We rely on protocols to abort if there is a write
// error. It might be more robust to handle them here as well.
- p.DebugDetailf("Read error: %v\n", err)
+ glog.V(logger.Detail).Infof("%v: Read error: %v\n", p, err)
reason = DiscNetworkError
}
case err := <-p.protoErr:
@@ -141,7 +136,7 @@ func (p *Peer) run() DiscReason {
close(p.closed)
p.politeDisconnect(reason)
p.wg.Wait()
- p.Debugf("Disconnected: %v\n", reason)
+ glog.V(logger.Debug).Infof("%v: Disconnected: %v\n", p, reason)
return reason
}
@@ -195,7 +190,7 @@ func (p *Peer) handle(msg Msg) error {
// This is the last message. We don't need to discard or
// check errors because, the connection will be closed after it.
rlp.Decode(msg.Payload, &reason)
- p.Debugf("Disconnect requested: %v\n", reason[0])
+ glog.V(logger.Debug).Infof("%v: Disconnect Requested: %v\n", p, reason[0])
return DiscRequested
case msg.Code < baseProtocolLength:
// ignore other base protocol messages
@@ -239,14 +234,14 @@ func (p *Peer) startProtocols() {
for _, proto := range p.running {
proto := proto
proto.closed = p.closed
- p.DebugDetailf("Starting protocol %s/%d\n", proto.Name, proto.Version)
+ glog.V(logger.Detail).Infof("%v: Starting protocol %s/%d\n", p, proto.Name, proto.Version)
go func() {
err := proto.Run(p, proto)
if err == nil {
- p.DebugDetailf("Protocol %s/%d returned\n", proto.Name, proto.Version)
+ glog.V(logger.Detail).Infof("%v: Protocol %s/%d returned\n", p, proto.Name, proto.Version)
err = errors.New("protocol returned")
- } else {
- p.DebugDetailf("Protocol %s/%d error: %v\n", proto.Name, proto.Version, err)
+ } else if err != io.EOF {
+ glog.V(logger.Detail).Infof("%v: Protocol %s/%d error: \n", p, proto.Name, proto.Version, err)
}
p.protoErr <- err
p.wg.Done()
diff --git a/whisper/peer.go b/whisper/peer.go
index 9fdc28434..0d9538ffc 100644
--- a/whisper/peer.go
+++ b/whisper/peer.go
@@ -5,6 +5,8 @@ import (
"time"
"github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/logger"
+ "github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/p2p"
"github.com/ethereum/go-ethereum/rlp"
"gopkg.in/fatih/set.v0"
@@ -36,13 +38,13 @@ func newPeer(host *Whisper, remote *p2p.Peer, rw p2p.MsgReadWriter) *peer {
// into the network.
func (self *peer) start() {
go self.update()
- self.peer.Debugln("whisper started")
+ glog.V(logger.Debug).Infof("%v: whisper started", self.peer)
}
// stop terminates the peer updater, stopping message forwarding to it.
func (self *peer) stop() {
close(self.quit)
- self.peer.Debugln("whisper stopped")
+ glog.V(logger.Debug).Infof("%v: whisper stopped", self.peer)
}
// handshake sends the protocol initiation status message to the remote peer and
@@ -94,7 +96,7 @@ func (self *peer) update() {
case <-transmit.C:
if err := self.broadcast(); err != nil {
- self.peer.Infoln("broadcast failed:", err)
+ glog.V(logger.Info).Infof("%v: broadcast failed: %v", self.peer, err)
return
}
@@ -152,7 +154,6 @@ func (self *peer) broadcast() error {
if err := p2p.Send(self.ws, messagesCode, transmit); err != nil {
return err
}
- self.peer.DebugDetailln("broadcasted", len(transmit), "message(s)")
-
+ glog.V(logger.Detail).Infoln(self.peer, "broadcasted", len(transmit), "message(s)")
return nil
}
diff --git a/whisper/whisper.go b/whisper/whisper.go
index a48e1e380..994b4e506 100644
--- a/whisper/whisper.go
+++ b/whisper/whisper.go
@@ -197,14 +197,14 @@ func (self *Whisper) handlePeer(peer *p2p.Peer, rw p2p.MsgReadWriter) error {
}
var envelopes []*Envelope
if err := packet.Decode(&envelopes); err != nil {
- peer.Infof("failed to decode enveloped: %v", err)
+ glog.V(logger.Info).Infof("%v: failed to decode envelope: %v", peer, err)
continue
}
// Inject all envelopes into the internal pool
for _, envelope := range envelopes {
if err := self.add(envelope); err != nil {
// TODO Punish peer here. Invalid envelope.
- peer.Debugf("failed to pool envelope: %f", err)
+ glog.V(logger.Debug).Infof("%v: failed to pool envelope: %v", peer, err)
}
whisperPeer.mark(envelope)
}