aboutsummaryrefslogtreecommitdiffstats
path: root/whisper
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 /whisper
parentbcfd7886619c9bc16f523f89ddd012cb53aa7159 (diff)
downloadgo-tangerine-6a2fec5309e14df6b5fcd0fb76d5b123565d40d4.tar.gz
go-tangerine-6a2fec5309e14df6b5fcd0fb76d5b123565d40d4.tar.zst
go-tangerine-6a2fec5309e14df6b5fcd0fb76d5b123565d40d4.zip
p2p, whisper: use glog for peer-level logging
Diffstat (limited to 'whisper')
-rw-r--r--whisper/peer.go11
-rw-r--r--whisper/whisper.go4
2 files changed, 8 insertions, 7 deletions
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)
}