ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixups.

Browse Source
This commit is contained in:
JoelKatz
2012-10-08 00:49:55 -07:00
parent 12c6a37cac
commit 470e2c5747
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/LedgerConsensus.cpp
View File

@@ -417,8 +417,7 @@ void LedgerConsensus::createDisputes(SHAMap::ref m1, SHAMap::ref m2)
void LedgerConsensus::mapComplete(const uint256& hash, SHAMap::ref map, bool acquired)
{
if (acquired)
cLog(lsINFO) << "We have acquired TXS " << hash;
tLog(acquired, lsINFO) << "We have acquired TXS " << hash;
if (!map)
{ // this is an invalid/corrupt map
@@ -458,8 +457,7 @@ void LedgerConsensus::mapComplete(const uint256& hash, SHAMap::ref map, bool acq
}
if (!peers.empty())
adjustCount(map, peers);
else if (acquired)
cLog(lsWARNING) << "By the time we got the map " << hash << " no peers were proposing it";
else tLog(acquired, lsWARNING) << "By the time we got the map " << hash << " no peers were proposing it";
sendHaveTxSet(hash, true);
}
@@ -547,8 +545,7 @@ void LedgerConsensus::stateEstablish()
updateOurPositions();
if (!mHaveCloseTimeConsensus)
{
if (haveConsensus())
cLog(lsINFO) << "We have TX consensus but not CT consensus";
tLog(haveConsensus(), lsINFO) << "We have TX consensus but not CT consensus";
}
else if (haveConsensus())
{
@@ -681,9 +678,8 @@ void LedgerConsensus::updateOurPositions()
thresh = it->second;
}
}
if (!mHaveCloseTimeConsensus)
cLog(lsDEBUG) << "No CT consensus: Proposers:" << mPeerPositions.size() << " Proposing:" <<
(mProposing ? "yes" : "no") << " Thresh:" << thresh << " Pos:" << closeTime;
tLog(!mHaveCloseTimeConsensus, lsDEBUG) << "No CT consensus: Proposers:" << mPeerPositions.size()
<< " Proposing:" << (mProposing ? "yes" : "no") << " Thresh:" << thresh << " Pos:" << closeTime;
}
if ((!changes) &&