From 4d6bf6fd437d0ac194df2dfa2a69f1ddd534e6fb Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Tue, 19 Feb 2013 15:41:03 -0800 Subject: [PATCH] Logging reductions. --- src/cpp/ripple/LedgerMaster.cpp | 2 +- src/cpp/ripple/Log.cpp | 7 ++++++- src/cpp/ripple/OrderBookDB.cpp | 4 ++-- src/cpp/ripple/Pathfinder.cpp | 6 +++--- src/cpp/ripple/ValidationCollection.cpp | 2 +- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/cpp/ripple/LedgerMaster.cpp b/src/cpp/ripple/LedgerMaster.cpp index e486cd9d9b..5176d58795 100644 --- a/src/cpp/ripple/LedgerMaster.cpp +++ b/src/cpp/ripple/LedgerMaster.cpp @@ -455,7 +455,7 @@ void LedgerMaster::tryPublish() { for (uint32 seq = mPubLedger->getLedgerSeq() + 1; seq <= mValidLedger->getLedgerSeq(); ++seq) { - cLog(lsDEBUG) << "Trying to publish ledger " << seq; + cLog(lsTRACE) << "Trying to publish ledger " << seq; Ledger::pointer ledger; uint256 hash; diff --git a/src/cpp/ripple/Log.cpp b/src/cpp/ripple/Log.cpp index d2e14c02c5..9bc49eb0b9 100644 --- a/src/cpp/ripple/Log.cpp +++ b/src/cpp/ripple/Log.cpp @@ -199,7 +199,12 @@ namespace websocketpp void websocketLog(websocketpp::log::alevel::value v, const std::string& entry) { - if (websocketPartition.doLog(lsDEBUG)) + if (v == websocketpp::log::alevel::DEVEL) + { + if (websocketPartition.doLog(lsTRACE)) + Log(lsDEBUG, websocketPartition) << entry; + } + else if (websocketPartition.doLog(lsDEBUG)) Log(lsDEBUG, websocketPartition) << entry; } diff --git a/src/cpp/ripple/OrderBookDB.cpp b/src/cpp/ripple/OrderBookDB.cpp index 619ae87b4b..7113abe243 100644 --- a/src/cpp/ripple/OrderBookDB.cpp +++ b/src/cpp/ripple/OrderBookDB.cpp @@ -44,13 +44,13 @@ void OrderBookDB::setup(Ledger::ref ledger) OrderBook::pointer book = OrderBook::newOrderBook(entry); if (book) { - cLog(lsDEBUG) << "OrderBookDB: found book"; + cLog(lsTRACE) << "OrderBookDB: found book"; if (mKnownMap.find(book->getBookBase()) == mKnownMap.end()) { mKnownMap[book->getBookBase()] = true; - cLog(lsDEBUG) << "OrderBookDB: unknown book in: " + cLog(lsTRACE) << "OrderBookDB: unknown book in: " << STAmount::createHumanCurrency(book->getCurrencyIn()) << " -> " << STAmount::createHumanCurrency(book->getCurrencyOut()); diff --git a/src/cpp/ripple/Pathfinder.cpp b/src/cpp/ripple/Pathfinder.cpp index aaf895d312..dc73df8972 100644 --- a/src/cpp/ripple/Pathfinder.cpp +++ b/src/cpp/ripple/Pathfinder.cpp @@ -90,7 +90,7 @@ bool Pathfinder::bDefaultPath(const STPath& spPath) { if (2 == spPath.mPath.size()) { // Empty path is a default. Don't need to add it to return set. - cLog(lsDEBUG) << "findPaths: empty path: direct"; + cLog(lsTRACE) << "findPaths: empty path: direct"; return true; } @@ -285,8 +285,8 @@ bool Pathfinder::findPaths(const unsigned int iMaxSteps, const unsigned int iMax continue; } - cLog(lsDEBUG) << "findPaths: finish? account: " << (speEnd.mAccountID == mDstAccountID); - cLog(lsDEBUG) << "findPaths: finish? currency: " << (speEnd.mCurrencyID == mDstAmount.getCurrency()); + cLog(lsTRACE) << "findPaths: finish? account: " << (speEnd.mAccountID == mDstAccountID); + cLog(lsTRACE) << "findPaths: finish? currency: " << (speEnd.mCurrencyID == mDstAmount.getCurrency()); cLog(lsTRACE) << "findPaths: finish? issuer: " << RippleAddress::createHumanAccountID(speEnd.mIssuerID) << " / " diff --git a/src/cpp/ripple/ValidationCollection.cpp b/src/cpp/ripple/ValidationCollection.cpp index e24f3512b4..5fff5a1202 100644 --- a/src/cpp/ripple/ValidationCollection.cpp +++ b/src/cpp/ripple/ValidationCollection.cpp @@ -79,7 +79,7 @@ bool ValidationCollection::addValidation(SerializedValidation::ref val) } } - cLog(lsINFO) << "Val for " << hash << " from " << signer.humanNodePublic() + cLog(lsDEBUG) << "Val for " << hash << " from " << signer.humanNodePublic() << " added " << (val->isTrusted() ? "trusted/" : "UNtrusted/") << (isCurrent ? "current" : "stale"); if (val->isTrusted()) theApp->getLedgerMaster().checkAccept(hash);