From 73fe72bfa30c82fe3bb5bf1f644d4460a0f86c96 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Tue, 12 Feb 2013 22:05:46 -0800 Subject: [PATCH] Track whether a message is a broadcast. If a broadcast, log at a lower level. --- src/cpp/ripple/NetworkOPs.cpp | 12 ++++++------ src/cpp/ripple/NetworkOPs.h | 2 +- src/cpp/ripple/OrderBookDB.cpp | 2 +- src/cpp/ripple/RPCSub.cpp | 4 ++-- src/cpp/ripple/RPCSub.h | 2 +- src/cpp/ripple/WSConnection.h | 4 ++-- src/cpp/ripple/WSHandler.h | 14 +++++++------- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/cpp/ripple/NetworkOPs.cpp b/src/cpp/ripple/NetworkOPs.cpp index a97bb08f2d..4df73986f3 100644 --- a/src/cpp/ripple/NetworkOPs.cpp +++ b/src/cpp/ripple/NetworkOPs.cpp @@ -1026,7 +1026,7 @@ void NetworkOPs::pubServer() BOOST_FOREACH(InfoSub* ispListener, mSubServer) { - ispListener->send(jvObj); + ispListener->send(jvObj, true); } } } @@ -1228,7 +1228,7 @@ void NetworkOPs::pubProposedTransaction(Ledger::ref lpCurrent, const SerializedT boost::recursive_mutex::scoped_lock sl(mMonitorLock); BOOST_FOREACH(InfoSub* ispListener, mSubRTTransactions) { - ispListener->send(jvObj); + ispListener->send(jvObj, true); } } TransactionMetaSet::pointer ret; @@ -1259,7 +1259,7 @@ void NetworkOPs::pubLedger(Ledger::ref lpAccepted) BOOST_FOREACH(InfoSub* ispListener, mSubLedger) { - ispListener->send(jvObj); + ispListener->send(jvObj, true); } } } @@ -1333,12 +1333,12 @@ void NetworkOPs::pubAcceptedTransaction(Ledger::ref lpCurrent, const SerializedT BOOST_FOREACH(InfoSub* ispListener, mSubTransactions) { - ispListener->send(jvObj); + ispListener->send(jvObj, true); } BOOST_FOREACH(InfoSub* ispListener, mSubRTTransactions) { - ispListener->send(jvObj); + ispListener->send(jvObj, true); } } theApp->getOrderBookDB().processTxn(stTxn, terResult, meta, jvObj); @@ -1400,7 +1400,7 @@ void NetworkOPs::pubAccountTransaction(Ledger::ref lpCurrent, const SerializedTr BOOST_FOREACH(InfoSub* ispListener, notify) { - ispListener->send(jvObj); + ispListener->send(jvObj, true); } } } diff --git a/src/cpp/ripple/NetworkOPs.h b/src/cpp/ripple/NetworkOPs.h index 1adefd0347..819e0b95ba 100644 --- a/src/cpp/ripple/NetworkOPs.h +++ b/src/cpp/ripple/NetworkOPs.h @@ -36,7 +36,7 @@ public: virtual ~InfoSub(); - virtual void send(const Json::Value& jvObj) = 0; + virtual void send(const Json::Value& jvObj, bool broadcast) = 0; void onSendEmpty(); diff --git a/src/cpp/ripple/OrderBookDB.cpp b/src/cpp/ripple/OrderBookDB.cpp index b4c05a580d..83c1f1ee18 100644 --- a/src/cpp/ripple/OrderBookDB.cpp +++ b/src/cpp/ripple/OrderBookDB.cpp @@ -229,7 +229,7 @@ void BookListeners::publish(Json::Value& jvObj) BOOST_FOREACH(InfoSub* sub,mListeners) { - sub->send(jvObj); + sub->send(jvObj, true); } } diff --git a/src/cpp/ripple/RPCSub.cpp b/src/cpp/ripple/RPCSub.cpp index 097cb733da..2a6ac6af89 100644 --- a/src/cpp/ripple/RPCSub.cpp +++ b/src/cpp/ripple/RPCSub.cpp @@ -85,7 +85,7 @@ void RPCSub::sendThread() } while (bSend); } -void RPCSub::send(const Json::Value& jvObj) +void RPCSub::send(const Json::Value& jvObj, bool broadcast) { boost::mutex::scoped_lock sl(mLockInfo); @@ -96,7 +96,7 @@ void RPCSub::send(const Json::Value& jvObj) mDeque.pop_back(); } - cLog(lsINFO) << boost::str(boost::format("callRPC push: %s") % jvObj); + cLog(broadcast ? lsDEBUG : lsINFO) << boost::str(boost::format("callRPC push: %s") % jvObj); mDeque.push_back(std::make_pair(mSeq++, jvObj)); diff --git a/src/cpp/ripple/RPCSub.h b/src/cpp/ripple/RPCSub.h index dc2270a6da..03172410f7 100644 --- a/src/cpp/ripple/RPCSub.h +++ b/src/cpp/ripple/RPCSub.h @@ -35,7 +35,7 @@ public: virtual ~RPCSub() { ; } // Implement overridden functions from base class: - void send(const Json::Value& jvObj); + void send(const Json::Value& jvObj, bool broadcast); void setUsername(const std::string& strUsername) { diff --git a/src/cpp/ripple/WSConnection.h b/src/cpp/ripple/WSConnection.h index 6e2417fe12..c09c1553b2 100644 --- a/src/cpp/ripple/WSConnection.h +++ b/src/cpp/ripple/WSConnection.h @@ -72,11 +72,11 @@ public: } // Implement overridden functions from base class: - void send(const Json::Value& jvObj) + void send(const Json::Value& jvObj, bool broadcast) { connection_ptr ptr = mConnection.lock(); if (ptr) - mHandler->send(ptr, jvObj); + mHandler->send(ptr, jvObj, broadcast); } // Utilities diff --git a/src/cpp/ripple/WSHandler.h b/src/cpp/ripple/WSHandler.h index 04dadefd35..b2d4acb8c6 100644 --- a/src/cpp/ripple/WSHandler.h +++ b/src/cpp/ripple/WSHandler.h @@ -61,11 +61,11 @@ public: } } - void send(connection_ptr cpClient, const std::string& strMessage) + void send(connection_ptr cpClient, const std::string& strMessage, bool broadcast) { try { - cLog(lsDEBUG) << "Ws:: Sending '" << strMessage << "'"; + cLog(broadcast ? lsTRACE : lsDEBUG) << "Ws:: Sending '" << strMessage << "'"; cpClient->send(strMessage); } @@ -75,13 +75,13 @@ public: } } - void send(connection_ptr cpClient, const Json::Value& jvObj) + void send(connection_ptr cpClient, const Json::Value& jvObj, bool broadcast) { Json::FastWriter jfwWriter; // cLog(lsDEBUG) << "Ws:: Object '" << jfwWriter.write(jvObj) << "'"; - send(cpClient, jfwWriter.write(jvObj)); + send(cpClient, jfwWriter.write(jvObj), broadcast); } void pingTimer(connection_ptr cpClient) @@ -177,7 +177,7 @@ public: jvResult["type"] = "error"; jvResult["error"] = "wsTextRequired"; // We only accept text messages. - send(cpClient, jvResult); + send(cpClient, jvResult, false); } else if (!jrReader.parse(mpMessage->get_payload(), jvRequest) || jvRequest.isNull() || !jvRequest.isObject()) { @@ -187,7 +187,7 @@ public: jvResult["error"] = "jsonInvalid"; // Received invalid json. jvResult["value"] = mpMessage->get_payload(); - send(cpClient, jvResult); + send(cpClient, jvResult, false); } else { @@ -200,7 +200,7 @@ public: return; conn = it->second; } - send(cpClient, conn->invokeCommand(jvRequest)); + send(cpClient, conn->invokeCommand(jvRequest), false); } }