From e4b954c30cd64a09b27d893f080e7c6e9faa8dd9 Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Mon, 5 Nov 2012 02:05:51 -0800
Subject: [PATCH] Logging improvements.

---
 src/LedgerConsensus.cpp | 18 +++++++++++++++++-
 src/NetworkOPs.cpp      |  3 +++
 src/Peer.cpp            |  1 +
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/LedgerConsensus.cpp b/src/LedgerConsensus.cpp
index f75f21720..fa20269e4 100644
--- a/src/LedgerConsensus.cpp
+++ b/src/LedgerConsensus.cpp
@@ -35,11 +35,12 @@ void TransactionAcquire::done()
 {
 	if (mFailed)
 	{
-		cLog(lsWARNING) << "Failed to acquire TXs " << mHash;
+		cLog(lsWARNING) << "Failed to acquire TX set " << mHash;
 		theApp->getOPs().mapComplete(mHash, SHAMap::pointer());
 	}
 	else
 	{
+		cLog(lsINFO) << "Acquired TX set " << mHash;
 		mMap->setImmutable();
 		theApp->getOPs().mapComplete(mHash, mMap);
 	}
@@ -125,9 +126,15 @@ bool TransactionAcquire::takeNodes(const std::list<SHAMapNode>& nodeIDs,
 	const std::list< std::vector<unsigned char> >& data, Peer::ref peer)
 {
 	if (mComplete)
+	{
+		cLog(lsTRACE) << "TX set complete";
 		return true;
+	}
 	if (mFailed)
+	{
+		cLog(lsTRACE) << "TX set failed";
 		return false;
+	}
 	try
 	{
 		std::list<SHAMapNode>::const_iterator nodeIDit = nodeIDs.begin();
@@ -143,12 +150,18 @@ bool TransactionAcquire::takeNodes(const std::list<SHAMapNode>& nodeIDs,
 					return false;
 				}
 				if (!mMap->addRootNode(getHash(), *nodeDatait, snfWIRE, NULL))
+				{
+					cLog(lsWARNING) << "TX acquire got bad root node";
 					return false;
+				}
 				else
 					mHaveRoot = true;
 			}
 			else if (!mMap->addKnownNode(*nodeIDit, *nodeDatait, &sf))
+			{
+				cLog(lsWARNING) << "TX acquire got bad non-root node";
 				return false;
+			}
 			++nodeIDit;
 			++nodeDatait;
 		}
@@ -953,7 +966,10 @@ bool LedgerConsensus::peerGaveNodes(Peer::ref peer, const uint256& setHash,
 {
 	boost::unordered_map<uint256, TransactionAcquire::pointer>::iterator acq = mAcquiring.find(setHash);
 	if (acq == mAcquiring.end())
+	{
+		cLog(lsINFO) << "Got TX data for set not acquiring: " << setHash;
 		return false;
+	}
 	TransactionAcquire::pointer set = acq->second; // We must keep the set around during the function
 	return set->takeNodes(nodeIDs, nodeData, peer);
 }
diff --git a/src/NetworkOPs.cpp b/src/NetworkOPs.cpp
index d9fa2ddc9..bbb17dfee 100644
--- a/src/NetworkOPs.cpp
+++ b/src/NetworkOPs.cpp
@@ -766,7 +766,10 @@ bool NetworkOPs::gotTXData(const boost::shared_ptr<Peer>& peer, const uint256& h
 	const std::list<SHAMapNode>& nodeIDs, const std::list< std::vector<unsigned char> >& nodeData)
 {
 	if (!haveConsensusObject())
+	{
+		cLog(lsWARNING) << "Got TX data with no consensus object";
 		return false;
+	}
 	return mConsensus->peerGaveNodes(peer, hash, nodeIDs, nodeData);
 }
 
diff --git a/src/Peer.cpp b/src/Peer.cpp
index 89a196e79..f6858864f 100644
--- a/src/Peer.cpp
+++ b/src/Peer.cpp
@@ -1331,6 +1331,7 @@ void Peer::recvLedger(ripple::TMLedgerData& packet)
 		uint256 hash;
 		if(packet.ledgerhash().size() != 32)
 		{
+			cLog(lsWARNING) << "TX candidate reply with invalid hash size";
 			punishPeer(PP_INVALID_REQUEST);
 			return;
 		}