Cleanups.

This commit is contained in:
JoelKatz
2013-08-12 10:59:34 -07:00
parent 4a949a9cbd
commit 699b46088a
2 changed files with 6 additions and 2 deletions

View File

@@ -600,6 +600,8 @@ void LedgerMaster::advanceThread()
}
}
}
else
WriteLog (lsTRACE, LedgerMaster) << "Not fetching history";
}
else
{
@@ -690,8 +692,7 @@ std::list<Ledger::pointer> 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();
}
}

View File

@@ -817,6 +817,9 @@ Json::Value InboundLedger::getJson (int)
if (mFailed)
ret["failed"] = true;
if (!mComplete && !mFailed)
ret["peers"] = static_cast<int>(mPeers.size());
ret["have_base"] = mHaveBase;
ret["have_state"] = mHaveState;
ret["have_transactions"] = mHaveTransactions;