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

Set the network state timer a bit later.

Browse Source
This commit is contained in:
JoelKatz
2013-03-26 11:40:45 -07:00
parent 7e5d4b80d9
commit 694c97d2fb
1 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/cpp/ripple/NetworkOPs.cpp
View File

@@ -564,7 +564,7 @@ Json::Value NetworkOPs::getOwnerInfo(Ledger::pointer lpLedger, const RippleAddre
// //
void NetworkOPs::setStateTimer() void NetworkOPs::setStateTimer()
{ // set timer early if ledger is closing {
mNetTimer.expires_from_now(boost::posix_time::milliseconds(LEDGER_GRANULARITY)); mNetTimer.expires_from_now(boost::posix_time::milliseconds(LEDGER_GRANULARITY));
mNetTimer.async_wait(boost::bind(&NetworkOPs::checkState, this, boost::asio::placeholders::error)); mNetTimer.async_wait(boost::bind(&NetworkOPs::checkState, this, boost::asio::placeholders::error));
} }
@@ -594,10 +594,12 @@ void NetworkOPs::checkState(const boost::system::error_code& result)
{ // Network state machine { // Network state machine
if ((result == boost::asio::error::operation_aborted) || theConfig.RUN_STANDALONE) if ((result == boost::asio::error::operation_aborted) || theConfig.RUN_STANDALONE)
{
cLog(lsFATAL) << "Network state timer error: " << result;
return; return;
}
setStateTimer(); {
ScopedLock(theApp->getMasterLock()); ScopedLock(theApp->getMasterLock());
std::vector<Peer::pointer> peerList = theApp->getConnectionPool().getPeerVector(); std::vector<Peer::pointer> peerList = theApp->getConnectionPool().getPeerVector();
@@ -624,6 +626,9 @@ void NetworkOPs::checkState(const boost::system::error_code& result)
if (mConsensus) if (mConsensus)
mConsensus->timerEntry(); mConsensus->timerEntry();
}
setStateTimer();
} }
void NetworkOPs::tryStartConsensus() void NetworkOPs::tryStartConsensus()