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

Reset the validator list fetch timer if an error occurs

Browse Source
This commit is contained in:
Nik Bougalis
2018-11-07 09:30:59 -08:00
parent 945493d9cf
commit 753600a2a0
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/ripple/app/misc/impl/ValidatorSite.cpp
View File

@@ -26,6 +26,7 @@
#include <ripple/json/json_reader.h> #include <ripple/json/json_reader.h>
#include <ripple/protocol/JsonFields.h> #include <ripple/protocol/JsonFields.h>
#include <boost/regex.hpp> #include <boost/regex.hpp>
#include <algorithm>
namespace ripple { namespace ripple {
@@ -152,11 +153,12 @@ void
ValidatorSite::setTimer () ValidatorSite::setTimer ()
{ {
std::lock_guard <std::mutex> lock{sites_mutex_}; std::lock_guard <std::mutex> lock{sites_mutex_};
auto next = sites_.end();
for (auto it = sites_.begin (); it != sites_.end (); ++it) auto next = std::min_element(sites_.begin(), sites_.end(),
if (next == sites_.end () || it->nextRefresh < next->nextRefresh) [](Site const& a, Site const& b)
next = it; {
return a.nextRefresh < b.nextRefresh;
});
if (next != sites_.end ()) if (next != sites_.end ())
{ {
@@ -164,8 +166,7 @@ ValidatorSite::setTimer ()
cv_.notify_all(); cv_.notify_all();
timer_.expires_at (next->nextRefresh); timer_.expires_at (next->nextRefresh);
timer_.async_wait (std::bind (&ValidatorSite::onTimer, this, timer_.async_wait (std::bind (&ValidatorSite::onTimer, this,
std::distance (sites_.begin (), next), std::distance (sites_.begin (), next), std::placeholders::_1));
std::placeholders::_1));
} }
} }
@@ -213,12 +214,12 @@ ValidatorSite::onTimer (
std::size_t siteIdx, std::size_t siteIdx,
error_code const& ec) error_code const& ec)
{ {
if (ec == boost::asio::error::operation_aborted)
return;
if (ec) if (ec)
{ {
JLOG(j_.error()) << // Restart the timer if any errors are encountered, unless the error
"ValidatorSite::onTimer: " << ec.message(); // is from the wait operating being aborted due to a shutdown request.
if (ec != boost::asio::error::operation_aborted)
onSiteFetch(ec, detail::response_type {}, siteIdx);
return; return;
} }