ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a spinout where we set the timer for shorter and shorter times.

Browse Source
This commit is contained in:
JoelKatz
2012-05-10 16:08:09 -07:00
parent 833dc00894
commit eb5cc1617e
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/NetworkOPs.cpp
View File

@@ -155,8 +155,11 @@ void NetworkOPs::setStateTimer(int sec)
uint64 closedTime = theApp->getMasterLedger().getCurrentLedger()->getCloseTimeNC(); uint64 closedTime = theApp->getMasterLedger().getCurrentLedger()->getCloseTimeNC();
uint64 now = getNetworkTimeNC(); uint64 now = getNetworkTimeNC();
if (now >= closedTime) sec = 0; if (mMode == omFULL)
else if (sec > (closedTime - now)) sec = (closedTime - now); {
if (now >= closedTime) sec = 0;
else if (sec > (closedTime - now)) sec = (closedTime - now);
}
mNetTimer.expires_from_now(boost::posix_time::seconds(sec)); mNetTimer.expires_from_now(boost::posix_time::seconds(sec));
mNetTimer.async_wait(boost::bind(&NetworkOPs::checkState, this, boost::asio::placeholders::error)); mNetTimer.async_wait(boost::bind(&NetworkOPs::checkState, this, boost::asio::placeholders::error));
@@ -264,6 +267,9 @@ void NetworkOPs::checkState(const boost::system::error_code& result)
Ledger::pointer consensus = theApp->getMasterLedger().getLedgerByHash(closedLedger); Ledger::pointer consensus = theApp->getMasterLedger().getLedgerByHash(closedLedger);
if (!consensus) if (!consensus)
{ {
#ifdef DEBUG
std::cerr << "Acquiring consensus ledger" << std::endl;
#endif
LedgerAcquire::pointer acq = theApp->getMasterLedgerAcquire().findCreate(closedLedger); LedgerAcquire::pointer acq = theApp->getMasterLedgerAcquire().findCreate(closedLedger);
if (!acq || acq->isFailed()) if (!acq || acq->isFailed())
{ {