ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-24 21:15:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce some logging.

Browse Source
This commit is contained in:
JoelKatz
2013-04-29 09:31:44 -07:00
parent 192dc2e85c
commit ee726819c9
2 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/cpp/ripple/LedgerEntrySet.cpp
View File

@@ -553,7 +553,7 @@ TER LedgerEntrySet::dirAdd(
const uint256& uLedgerIndex, const uint256& uLedgerIndex,
FUNCTION_TYPE<void (SLE::ref)> fDescriber) FUNCTION_TYPE<void (SLE::ref)> fDescriber)
{ {
cLog(lsDEBUG) << boost::str(boost::format("dirAdd: uRootIndex=%s uLedgerIndex=%s") cLog(lsTRACE) << boost::str(boost::format("dirAdd: uRootIndex=%s uLedgerIndex=%s")
% uRootIndex.ToString() % uRootIndex.ToString()
% uLedgerIndex.ToString()); % uLedgerIndex.ToString());
@@ -637,9 +637,9 @@ TER LedgerEntrySet::dirAdd(
svIndexes.peekValue().push_back(uLedgerIndex); // Append entry. svIndexes.peekValue().push_back(uLedgerIndex); // Append entry.
sleNode->setFieldV256(sfIndexes, svIndexes); // Save entry. sleNode->setFieldV256(sfIndexes, svIndexes); // Save entry.
cLog(lsDEBUG) << "dirAdd: creating: root: " << uRootIndex.ToString(); cLog(lsTRACE) << "dirAdd: creating: root: " << uRootIndex.ToString();
cLog(lsDEBUG) << "dirAdd: appending: Entry: " << uLedgerIndex.ToString(); cLog(lsTRACE) << "dirAdd: appending: Entry: " << uLedgerIndex.ToString();
cLog(lsDEBUG) << "dirAdd: appending: Node: " << strHex(uNodeDir); cLog(lsTRACE) << "dirAdd: appending: Node: " << strHex(uNodeDir);
// cLog(lsINFO) << "dirAdd: appending: PREV: " << svIndexes.peekValue()[0].ToString(); // cLog(lsINFO) << "dirAdd: appending: PREV: " << svIndexes.peekValue()[0].ToString();
return tesSUCCESS; return tesSUCCESS;
@@ -1328,7 +1328,7 @@ TER LedgerEntrySet::trustDelete(SLE::ref sleRippleState, const uint160& uLowAcco
terResult = dirDelete(false, uHighNode, Ledger::getOwnerDirIndex(uHighAccountID), sleRippleState->getIndex(), false, !bHighNode); terResult = dirDelete(false, uHighNode, Ledger::getOwnerDirIndex(uHighAccountID), sleRippleState->getIndex(), false, !bHighNode);
} }
cLog(lsINFO) << "trustDelete: Deleting ripple line: state"; cLog(lsTRACE) << "trustDelete: Deleting ripple line: state";
entryDelete(sleRippleState); entryDelete(sleRippleState);
return terResult; return terResult;

70
src/cpp/ripple/OfferCreateTransactor.cpp
View File

@@ -49,14 +49,14 @@ bool OfferCreateTransactor::bValidOffer(
} }
else else
{ {
cLog(lsINFO) << "bValidOffer: saOfferPays=" << saOfferPays.getFullText(); cLog(lsTRACE) << "bValidOffer: saOfferPays=" << saOfferPays.getFullText();
saOfferFunds = mEngine->getNodes().accountFunds(uOfferOwnerID, saOfferPays); saOfferFunds = mEngine->getNodes().accountFunds(uOfferOwnerID, saOfferPays);
if (!saOfferFunds.isPositive()) if (!saOfferFunds.isPositive())
{ {
// Offer is unfunded, possibly due to previous balance action. // Offer is unfunded, possibly due to previous balance action.
cLog(lsINFO) << "bValidOffer: offer unfunded: delete"; cLog(lsDEBUG) << "bValidOffer: offer unfunded: delete";
boost::unordered_set<uint160>::iterator account = usAccountTouched.find(uOfferOwnerID); boost::unordered_set<uint160>::iterator account = usAccountTouched.find(uOfferOwnerID);
if (account != usAccountTouched.end()) if (account != usAccountTouched.end())
@@ -111,7 +111,7 @@ TER OfferCreateTransactor::takeOffers(
assert(saTakerPays && saTakerGets); assert(saTakerPays && saTakerGets);
cLog(lsINFO) << "takeOffers: bSell: " << bSell << ": against book: " << uBookBase.ToString(); cLog(lsDEBUG) << "takeOffers: bSell: " << bSell << ": against book: " << uBookBase.ToString();
LedgerEntrySet& lesActive = mEngine->getNodes(); LedgerEntrySet& lesActive = mEngine->getNodes();
uint256 uTipIndex = uBookBase; uint256 uTipIndex = uBookBase;
@@ -148,14 +148,14 @@ TER OfferCreateTransactor::takeOffers(
uTipIndex = sleOfferDir->getIndex(); uTipIndex = sleOfferDir->getIndex();
uTipQuality = Ledger::getQuality(uTipIndex); uTipQuality = Ledger::getQuality(uTipIndex);
cLog(lsINFO) << boost::str(boost::format("takeOffers: possible counter offer found: uTipQuality=%d uTipIndex=%s") cLog(lsDEBUG) << boost::str(boost::format("takeOffers: possible counter offer found: uTipQuality=%d uTipIndex=%s")
% uTipQuality % uTipQuality
% uTipIndex.ToString()); % uTipIndex.ToString());
} }
else else
{ {
cLog(lsINFO) << "takeOffers: counter offer book is empty: " cLog(lsTRACE) << "takeOffers: counter offer book is empty: "
<< uTipIndex.ToString() << uTipIndex.ToString()
<< " ... " << " ... "
<< uBookEnd.ToString(); << uBookEnd.ToString();
@@ -165,7 +165,7 @@ TER OfferCreateTransactor::takeOffers(
if (!saTakerFunds.isPositive()) // Taker has no funds. if (!saTakerFunds.isPositive()) // Taker has no funds.
{ {
// Done. Ran out of funds on previous round. As fees aren't calculated directly in this routine, funds are checked here. // Done. Ran out of funds on previous round. As fees aren't calculated directly in this routine, funds are checked here.
cLog(lsINFO) << "takeOffers: done: taker unfunded."; cLog(lsDEBUG) << "takeOffers: done: taker unfunded.";
bUnfunded = true; // Don't create an order. bUnfunded = true; // Don't create an order.
terResult = tesSUCCESS; terResult = tesSUCCESS;
@@ -177,7 +177,7 @@ TER OfferCreateTransactor::takeOffers(
// Done. // Done.
STAmount saTipRate = sleOfferDir ? STAmount::setRate(uTipQuality) : saTakerRate; STAmount saTipRate = sleOfferDir ? STAmount::setRate(uTipQuality) : saTakerRate;
cLog(lsINFO) << boost::str(boost::format("takeOffers: done: dir=%d uTakeQuality=%d %c uTipQuality=%d saTakerRate=%s %c saTipRate=%s bPassive=%d") cLog(lsDEBUG) << boost::str(boost::format("takeOffers: done: dir=%d uTakeQuality=%d %c uTipQuality=%d saTakerRate=%s %c saTipRate=%s bPassive=%d")
% !!sleOfferDir % !!sleOfferDir
% uTakeQuality % uTakeQuality
% (uTakeQuality == uTipQuality % (uTakeQuality == uTipQuality
@@ -200,7 +200,7 @@ TER OfferCreateTransactor::takeOffers(
else else
{ {
// Have an offer directory to consider. // Have an offer directory to consider.
cLog(lsINFO) << "takeOffers: considering dir: " << sleOfferDir->getJson(0); cLog(lsTRACE) << "takeOffers: considering dir: " << sleOfferDir->getJson(0);
SLE::pointer sleBookNode; SLE::pointer sleBookNode;
unsigned int uBookEntry; unsigned int uBookEntry;
@@ -210,7 +210,7 @@ TER OfferCreateTransactor::takeOffers(
SLE::pointer sleOffer = mEngine->entryCache(ltOFFER, uOfferIndex); SLE::pointer sleOffer = mEngine->entryCache(ltOFFER, uOfferIndex);
cLog(lsINFO) << "takeOffers: considering offer : " << sleOffer->getJson(0); cLog(lsDEBUG) << "takeOffers: considering offer : " << sleOffer->getJson(0);
const uint160 uOfferOwnerID = sleOffer->getFieldAccount(sfAccount).getAccountID(); const uint160 uOfferOwnerID = sleOffer->getFieldAccount(sfAccount).getAccountID();
STAmount saOfferPays = sleOffer->getFieldAmount(sfTakerGets); STAmount saOfferPays = sleOffer->getFieldAmount(sfTakerGets);
@@ -232,17 +232,17 @@ TER OfferCreateTransactor::takeOffers(
STAmount saOfferIssuerFee; STAmount saOfferIssuerFee;
STAmount saOfferRate = STAmount::setRate(uTipQuality); STAmount saOfferRate = STAmount::setRate(uTipQuality);
cLog(lsINFO) << "takeOffers: applyOffer: saTakerPays: " << saTakerPays.getFullText(); cLog(lsDEBUG) << "takeOffers: applyOffer: saTakerPays: " << saTakerPays.getFullText();
cLog(lsINFO) << "takeOffers: applyOffer: saTakerPaid: " << saTakerPaid.getFullText(); cLog(lsDEBUG) << "takeOffers: applyOffer: saTakerPaid: " << saTakerPaid.getFullText();
cLog(lsINFO) << "takeOffers: applyOffer: saTakerFunds: " << saTakerFunds.getFullText(); cLog(lsDEBUG) << "takeOffers: applyOffer: saTakerFunds: " << saTakerFunds.getFullText();
cLog(lsINFO) << "takeOffers: applyOffer: saOfferFunds: " << saOfferFunds.getFullText(); cLog(lsDEBUG) << "takeOffers: applyOffer: saOfferFunds: " << saOfferFunds.getFullText();
cLog(lsINFO) << "takeOffers: applyOffer: saOfferPays: " << saOfferPays.getFullText(); cLog(lsDEBUG) << "takeOffers: applyOffer: saOfferPays: " << saOfferPays.getFullText();
cLog(lsINFO) << "takeOffers: applyOffer: saOfferGets: " << saOfferGets.getFullText(); cLog(lsDEBUG) << "takeOffers: applyOffer: saOfferGets: " << saOfferGets.getFullText();
cLog(lsINFO) << "takeOffers: applyOffer: saOfferRate: " << saOfferRate.getFullText(); cLog(lsDEBUG) << "takeOffers: applyOffer: saOfferRate: " << saOfferRate.getFullText();
cLog(lsINFO) << "takeOffers: applyOffer: saSubTakerPays: " << saSubTakerPays.getFullText(); cLog(lsDEBUG) << "takeOffers: applyOffer: saSubTakerPays: " << saSubTakerPays.getFullText();
cLog(lsINFO) << "takeOffers: applyOffer: saSubTakerGets: " << saSubTakerGets.getFullText(); cLog(lsDEBUG) << "takeOffers: applyOffer: saSubTakerGets: " << saSubTakerGets.getFullText();
cLog(lsINFO) << "takeOffers: applyOffer: saTakerPays: " << saTakerPays.getFullText(); cLog(lsDEBUG) << "takeOffers: applyOffer: saTakerPays: " << saTakerPays.getFullText();
cLog(lsINFO) << "takeOffers: applyOffer: saTakerGets: " << saTakerGets.getFullText(); cLog(lsDEBUG) << "takeOffers: applyOffer: saTakerGets: " << saTakerGets.getFullText();
bool bOfferDelete = STAmount::applyOffer( bool bOfferDelete = STAmount::applyOffer(
bSell, bSell,
@@ -260,8 +260,8 @@ TER OfferCreateTransactor::takeOffers(
saTakerIssuerFee, saTakerIssuerFee,
saOfferIssuerFee); saOfferIssuerFee);
cLog(lsINFO) << "takeOffers: applyOffer: saSubTakerPaid: " << saSubTakerPaid.getFullText(); cLog(lsDEBUG) << "takeOffers: applyOffer: saSubTakerPaid: " << saSubTakerPaid.getFullText();
cLog(lsINFO) << "takeOffers: applyOffer: saSubTakerGot: " << saSubTakerGot.getFullText(); cLog(lsDEBUG) << "takeOffers: applyOffer: saSubTakerGot: " << saSubTakerGot.getFullText();
// Adjust offer // Adjust offer
@@ -276,7 +276,7 @@ TER OfferCreateTransactor::takeOffers(
if (bOfferDelete) if (bOfferDelete)
{ {
// Offer now fully claimed or now unfunded. // Offer now fully claimed or now unfunded.
cLog(lsINFO) << "takeOffers: Offer claimed: Delete."; cLog(lsDEBUG) << "takeOffers: Offer claimed: Delete.";
usOfferUnfundedBecame.insert(uOfferIndex); // Delete unfunded offer on success. usOfferUnfundedBecame.insert(uOfferIndex); // Delete unfunded offer on success.
@@ -285,7 +285,7 @@ TER OfferCreateTransactor::takeOffers(
} }
else if (saSubTakerGot) else if (saSubTakerGot)
{ {
cLog(lsINFO) << "takeOffers: Offer partial claim."; cLog(lsDEBUG) << "takeOffers: Offer partial claim.";
if (!saOfferPays.isPositive() || !saOfferGets.isPositive()) if (!saOfferPays.isPositive() || !saOfferGets.isPositive())
{ {
@@ -297,7 +297,7 @@ TER OfferCreateTransactor::takeOffers(
else else
{ {
// Taker got nothing, probably due to rounding. Consider taker unfunded. // Taker got nothing, probably due to rounding. Consider taker unfunded.
cLog(lsINFO) << "takeOffers: No claim."; cLog(lsDEBUG) << "takeOffers: No claim.";
bUnfunded = true; bUnfunded = true;
terResult = tesSUCCESS; // Done. terResult = tesSUCCESS; // Done.
@@ -325,10 +325,10 @@ TER OfferCreateTransactor::takeOffers(
STAmount saTakerUsed = STAmount::multiply(saSubTakerGot, saTakerRate, saTakerPays); STAmount saTakerUsed = STAmount::multiply(saSubTakerGot, saTakerRate, saTakerPays);
cLog(lsINFO) << "takeOffers: applyOffer: saTakerCould: " << saTakerCould.getFullText(); cLog(lsDEBUG) << "takeOffers: applyOffer: saTakerCould: " << saTakerCould.getFullText();
cLog(lsINFO) << "takeOffers: applyOffer: saSubTakerGot: " << saSubTakerGot.getFullText(); cLog(lsDEBUG) << "takeOffers: applyOffer: saSubTakerGot: " << saSubTakerGot.getFullText();
cLog(lsINFO) << "takeOffers: applyOffer: saTakerRate: " << saTakerRate.getFullText(); cLog(lsDEBUG) << "takeOffers: applyOffer: saTakerRate: " << saTakerRate.getFullText();
cLog(lsINFO) << "takeOffers: applyOffer: saTakerUsed: " << saTakerUsed.getFullText(); cLog(lsDEBUG) << "takeOffers: applyOffer: saTakerUsed: " << saTakerUsed.getFullText();
saSubTakerPaid = std::min(saTakerCould, saTakerUsed); saSubTakerPaid = std::min(saTakerCould, saTakerUsed);
} }
@@ -342,14 +342,14 @@ TER OfferCreateTransactor::takeOffers(
} }
} }
cLog(lsINFO) << "takeOffers: " << transToken(terResult); cLog(lsDEBUG) << "takeOffers: " << transToken(terResult);
if (tesSUCCESS == terResult) if (tesSUCCESS == terResult)
{ {
// On success, delete offers that became unfunded. // On success, delete offers that became unfunded.
BOOST_FOREACH(const uint256& uOfferIndex, usOfferUnfundedBecame) BOOST_FOREACH(const uint256& uOfferIndex, usOfferUnfundedBecame)
{ {
cLog(lsINFO) << "takeOffers: became unfunded: " << uOfferIndex.ToString(); cLog(lsDEBUG) << "takeOffers: became unfunded: " << uOfferIndex.ToString();
terResult = lesActive.offerDelete(uOfferIndex); terResult = lesActive.offerDelete(uOfferIndex);
if (tesSUCCESS != terResult) if (tesSUCCESS != terResult)
@@ -357,14 +357,14 @@ TER OfferCreateTransactor::takeOffers(
} }
} }
cLog(lsINFO) << "takeOffers< " << transToken(terResult); cLog(lsDEBUG) << "takeOffers< " << transToken(terResult);
return terResult; return terResult;
} }
TER OfferCreateTransactor::doApply() TER OfferCreateTransactor::doApply()
{ {
cLog(lsDEBUG) << "OfferCreate> " << mTxn.getJson(0); cLog(lsTRACE) << "OfferCreate> " << mTxn.getJson(0);
const uint32 uTxFlags = mTxn.getFlags(); const uint32 uTxFlags = mTxn.getFlags();
const bool bPassive = isSetBit(uTxFlags, tfPassive); const bool bPassive = isSetBit(uTxFlags, tfPassive);
const bool bImmediateOrCancel = isSetBit(uTxFlags, tfImmediateOrCancel); const bool bImmediateOrCancel = isSetBit(uTxFlags, tfImmediateOrCancel);
@@ -373,7 +373,7 @@ TER OfferCreateTransactor::doApply()
STAmount saTakerPays = mTxn.getFieldAmount(sfTakerPays); STAmount saTakerPays = mTxn.getFieldAmount(sfTakerPays);
STAmount saTakerGets = mTxn.getFieldAmount(sfTakerGets); STAmount saTakerGets = mTxn.getFieldAmount(sfTakerGets);
cLog(lsINFO) << boost::str(boost::format("OfferCreate: saTakerPays=%s saTakerGets=%s") cLog(lsTRACE) << boost::str(boost::format("OfferCreate: saTakerPays=%s saTakerGets=%s")
% saTakerPays.getFullText() % saTakerPays.getFullText()
% saTakerGets.getFullText()); % saTakerGets.getFullText());
@@ -385,7 +385,7 @@ TER OfferCreateTransactor::doApply()
const uint256 uLedgerIndex = Ledger::getOfferIndex(mTxnAccountID, uSequence); const uint256 uLedgerIndex = Ledger::getOfferIndex(mTxnAccountID, uSequence);
cLog(lsINFO) << "OfferCreate: Creating offer node: " << uLedgerIndex.ToString() << " uSequence=" << uSequence; cLog(lsTRACE) << "OfferCreate: Creating offer node: " << uLedgerIndex.ToString() << " uSequence=" << uSequence;
const uint160 uPaysCurrency = saTakerPays.getCurrency(); const uint160 uPaysCurrency = saTakerPays.getCurrency();
const uint160 uGetsCurrency = saTakerGets.getCurrency(); const uint160 uGetsCurrency = saTakerGets.getCurrency();