From 699b46088a9ed4e403f10b68225691a4159cb0c3 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Mon, 12 Aug 2013 10:59:34 -0700 Subject: [PATCH] Cleanups. --- modules/ripple_app/ledger/LedgerMaster.cpp | 5 +++-- modules/ripple_app/ledger/ripple_InboundLedger.cpp | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/ripple_app/ledger/LedgerMaster.cpp b/modules/ripple_app/ledger/LedgerMaster.cpp index d5da4598c3..7dc791b341 100644 --- a/modules/ripple_app/ledger/LedgerMaster.cpp +++ b/modules/ripple_app/ledger/LedgerMaster.cpp @@ -600,6 +600,8 @@ void LedgerMaster::advanceThread() } } } + else + WriteLog (lsTRACE, LedgerMaster) << "Not fetching history"; } else { @@ -690,8 +692,7 @@ std::list LedgerMaster::findNewLedgersToPublish() WriteLog (lsWARNING, LedgerMaster) << "Failed to acquire a published ledger"; getApp().getInboundLedgers().dropLedger(hash); acq = getApp().getInboundLedgers().findCreate(hash, seq); - nothing (); - if (acq->isDone()) + if (acq->isComplete() && !acq->isFailed()) ledger = acq->getLedger(); } } diff --git a/modules/ripple_app/ledger/ripple_InboundLedger.cpp b/modules/ripple_app/ledger/ripple_InboundLedger.cpp index 1c738b481f..446e40e087 100644 --- a/modules/ripple_app/ledger/ripple_InboundLedger.cpp +++ b/modules/ripple_app/ledger/ripple_InboundLedger.cpp @@ -817,6 +817,9 @@ Json::Value InboundLedger::getJson (int) if (mFailed) ret["failed"] = true; + if (!mComplete && !mFailed) + ret["peers"] = static_cast(mPeers.size()); + ret["have_base"] = mHaveBase; ret["have_state"] = mHaveState; ret["have_transactions"] = mHaveTransactions;