From dcc1caaf68a32c56fdda7db381fd70b7c20ceef7 Mon Sep 17 00:00:00 2001
From: Jae Kwon <jae@tendermint.com>
Date: Thu, 31 Dec 2015 14:27:05 -0800
Subject: [PATCH] Make Receive() logging consistent

---
 blockchain/reactor.go |  2 +-
 consensus/reactor.go  | 18 +++++++++---------
 mempool/reactor.go    |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/blockchain/reactor.go b/blockchain/reactor.go
index fd0d4432e..fb8e07bf1 100644
--- a/blockchain/reactor.go
+++ b/blockchain/reactor.go
@@ -130,7 +130,7 @@ func (bcR *BlockchainReactor) Receive(chID byte, src *p2p.Peer, msgBytes []byte)
 		return
 	}
 
-	log.Notice("Received message", "src", src, "chID", chID, "msg", msg)
+	log.Info("Receive", "src", src, "chID", chID, "msg", msg)
 
 	switch msg := msg.(type) {
 	case *bcBlockRequestMessage:
diff --git a/consensus/reactor.go b/consensus/reactor.go
index 72139d9ea..f0e34cc48 100644
--- a/consensus/reactor.go
+++ b/consensus/reactor.go
@@ -139,22 +139,22 @@ func (conR *ConsensusReactor) RemovePeer(peer *p2p.Peer, reason interface{}) {
 // Messages affect either a peer state or the consensus state.
 // Peer state updates can happen in parallel, but processing of
 // proposals, block parts, and votes are ordered by the receiveRoutine
-func (conR *ConsensusReactor) Receive(chID byte, peer *p2p.Peer, msgBytes []byte) {
+func (conR *ConsensusReactor) Receive(chID byte, src *p2p.Peer, msgBytes []byte) {
 	if !conR.IsRunning() {
-		log.Debug("Receive", "channel", chID, "peer", peer, "bytes", msgBytes)
+		log.Debug("Receive", "src", src, "chId", chID, "bytes", msgBytes)
 		return
 	}
 
 	_, msg, err := DecodeMessage(msgBytes)
 	if err != nil {
-		log.Warn("Error decoding message", "channel", chID, "peer", peer, "msg", msg, "error", err, "bytes", msgBytes)
+		log.Warn("Error decoding message", "src", src, "chId", chID, "msg", msg, "error", err, "bytes", msgBytes)
 		// TODO punish peer?
 		return
 	}
-	log.Debug("Receive", "channel", chID, "peer", peer, "msg", msg)
+	log.Info("Receive", "src", src, "chId", chID, "msg", msg)
 
 	// Get peer states
-	ps := peer.Data.Get(types.PeerStateKey).(*PeerState)
+	ps := src.Data.Get(types.PeerStateKey).(*PeerState)
 
 	switch chID {
 	case StateChannel:
@@ -177,12 +177,12 @@ func (conR *ConsensusReactor) Receive(chID byte, peer *p2p.Peer, msgBytes []byte
 		switch msg := msg.(type) {
 		case *ProposalMessage:
 			ps.SetHasProposal(msg.Proposal)
-			conR.conS.peerMsgQueue <- msgInfo{msg, peer.Key}
+			conR.conS.peerMsgQueue <- msgInfo{msg, src.Key}
 		case *ProposalPOLMessage:
 			ps.ApplyProposalPOLMessage(msg)
 		case *BlockPartMessage:
 			ps.SetHasProposalBlockPart(msg.Height, msg.Round, msg.Part.Index)
-			conR.conS.peerMsgQueue <- msgInfo{msg, peer.Key}
+			conR.conS.peerMsgQueue <- msgInfo{msg, src.Key}
 		default:
 			log.Warn(Fmt("Unknown message type %v", reflect.TypeOf(msg)))
 		}
@@ -202,14 +202,14 @@ func (conR *ConsensusReactor) Receive(chID byte, peer *p2p.Peer, msgBytes []byte
 			ps.EnsureVoteBitArrays(height-1, lastCommitSize)
 			ps.SetHasVote(msg.Vote, msg.ValidatorIndex)
 
-			conR.conS.peerMsgQueue <- msgInfo{msg, peer.Key}
+			conR.conS.peerMsgQueue <- msgInfo{msg, src.Key}
 
 		default:
 			// don't punish (leave room for soft upgrades)
 			log.Warn(Fmt("Unknown message type %v", reflect.TypeOf(msg)))
 		}
 	default:
-		log.Warn(Fmt("Unknown channel %X", chID))
+		log.Warn(Fmt("Unknown chId %X", chID))
 	}
 
 	if err != nil {
diff --git a/mempool/reactor.go b/mempool/reactor.go
index 587cacd4e..ec0a2fbc0 100644
--- a/mempool/reactor.go
+++ b/mempool/reactor.go
@@ -63,7 +63,7 @@ func (memR *MempoolReactor) Receive(chID byte, src *p2p.Peer, msgBytes []byte) {
 		log.Warn("Error decoding message", "error", err)
 		return
 	}
-	log.Info("MempoolReactor received message", "msg", msg)
+	log.Info("Receive", "src", src, "chId", chID, "msg", msg)
 
 	switch msg := msg.(type) {
 	case *TxMessage: