ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-25 13:35:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jedmccaleb/NewCoin

Browse Source
This commit is contained in:
Arthur Britto
2013-02-24 14:24:14 -08:00
parent 2a7e753d06 076add0e73
commit 073fcbd96d
4 changed files with 64 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cpp/ripple/LedgerConsensus.cpp
View File

@@ -373,7 +373,7 @@ void LedgerConsensus::checkLCL()
uint256 netLgr = mPrevLedgerHash;
int netLgrCount = 0;
uint256 favoredLedger = (mState == lcsPRE_CLOSE) ? uint256() : mPrevLedgerHash; // Don't get stuck one ledger back
uint256 favoredLedger = mPrevLedgerHash; // Don't get stuck one ledger back or jump one forward
boost::unordered_map<uint256, currentValidationCount> vals =
theApp->getValidations().getCurrentValidations(favoredLedger);
@@ -397,7 +397,7 @@ void LedgerConsensus::checkLCL()
default: status = "unknown";
}
cLog(lsWARNING) << "View of consensus changed during consensus (" << netLgrCount << ") status="
cLog(lsWARNING) << "View of consensus changed during " << status << " (" << netLgrCount << ") status="
<< status << ", " << (mHaveCorrectLCL ? "CorrectLCL" : "IncorrectLCL");
cLog(lsWARNING) << mPrevLedgerHash << " to " << netLgr;
@@ -966,8 +966,8 @@ void LedgerConsensus::addDisputedTransaction(const uint256& txID, const std::vec
txn->setVote(pit.first, cit->second->hasItem(txID));
}
if (!ourVote && theApp->isNewFlag(txID, SF_RELAYED))
{ // We voted no and a trusted peer voted yes, so relay
if (theApp->isNewFlag(txID, SF_RELAYED))
{
ripple::TMTransaction msg;
msg.set_rawtransaction(&(tx.front()), tx.size());
msg.set_status(ripple::tsNEW);

2
src/cpp/ripple/Log.cpp
View File

@@ -208,7 +208,7 @@ namespace websocketpp
void websocketLog(websocketpp::log::alevel::value v, const std::string& entry)
{
if (v == websocketpp::log::alevel::DEVEL)
if ((v == websocketpp::log::alevel::DEVEL) || (v == websocketpp::log::alevel::DEBUG_CLOSE))
{
if (websocketPartition.doLog(lsTRACE))
Log(lsDEBUG, websocketPartition) << entry;