ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-20 19:15:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add uptime to crawl data (RIPD-997)

Browse Source
This commit is contained in:
Miguel Portilla
2015-07-27 13:28:19 -04:00
committed by Nik Bougalis
parent 1a3e2e3f36
commit 6cf75f0fc2
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ripple/overlay/impl/OverlayImpl.cpp
View File

@@ -744,6 +744,7 @@ OverlayImpl::size()
Json::Value Json::Value
OverlayImpl::crawl() OverlayImpl::crawl()
{ {
using namespace std::chrono;
Json::Value jv; Json::Value jv;
auto& av = jv["active"] = Json::Value(Json::arrayValue); auto& av = jv["active"] = Json::Value(Json::arrayValue);
std::lock_guard <decltype(mutex_)> lock (mutex_); std::lock_guard <decltype(mutex_)> lock (mutex_);
@@ -752,12 +753,14 @@ OverlayImpl::crawl()
if (auto const sp = e.second.lock()) if (auto const sp = e.second.lock())
{ {
auto& pv = av.append(Json::Value(Json::objectValue)); auto& pv = av.append(Json::Value(Json::objectValue));
pv[jss::type] = "peer";
pv[jss::public_key] = beast::base64_encode( pv[jss::public_key] = beast::base64_encode(
sp->getNodePublic().getNodePublic().data(), sp->getNodePublic().getNodePublic().data(),
sp->getNodePublic().getNodePublic().size()); sp->getNodePublic().getNodePublic().size());
pv[jss::type] = sp->slot()->inbound() ? pv[jss::type] = sp->slot()->inbound() ?
"in" : "out"; "in" : "out";
pv[jss::uptime] =
static_cast<std::uint32_t>(duration_cast<seconds>(
sp->uptime()).count());
if (sp->crawl()) if (sp->crawl())
{ {
pv[jss::ip] = sp->getRemoteAddress().address().to_string(); pv[jss::ip] = sp->getRemoteAddress().address().to_string();

1
src/ripple/overlay/impl/PeerImp.cpp
View File

@@ -75,6 +75,7 @@ PeerImp::PeerImp (id_t id, endpoint_type remote_endpoint,
, sanity_ (Sanity::unknown) , sanity_ (Sanity::unknown)
, insaneTime_ (clock_type::now()) , insaneTime_ (clock_type::now())
, publicKey_(publicKey) , publicKey_(publicKey)
, creationTime_ (clock_type::now())
, hello_(hello) , hello_(hello)
, usage_(consumer) , usage_(consumer)
, fee_ (Resource::feeLightPeer) , fee_ (Resource::feeLightPeer)

9
src/ripple/overlay/impl/PeerImp.h
View File

@@ -143,6 +143,7 @@ private:
std::chrono::milliseconds latency_ = std::chrono::milliseconds (-1); std::chrono::milliseconds latency_ = std::chrono::milliseconds (-1);
std::uint64_t lastPingSeq_ = 0; std::uint64_t lastPingSeq_ = 0;
clock_type::time_point lastPingTime_; clock_type::time_point lastPingTime_;
clock_type::time_point creationTime_;
std::mutex mutable recentLock_; std::mutex mutable recentLock_;
protocol::TMStatusChange last_status_; protocol::TMStatusChange last_status_;
@@ -279,6 +280,13 @@ public:
std::string std::string
getVersion() const; getVersion() const;
// Return the connection elapsed time.
clock_type::duration
uptime() const
{
return clock_type::now() - creationTime_;
}
Json::Value Json::Value
json() override; json() override;
@@ -497,6 +505,7 @@ PeerImp::PeerImp (std::unique_ptr<beast::asio::ssl_bundle>&& ssl_bundle,
, sanity_ (Sanity::unknown) , sanity_ (Sanity::unknown)
, insaneTime_ (clock_type::now()) , insaneTime_ (clock_type::now())
, publicKey_ (legacyPublicKey) , publicKey_ (legacyPublicKey)
, creationTime_ (clock_type::now())
, hello_ (std::move(hello)) , hello_ (std::move(hello))
, usage_ (usage) , usage_ (usage)
, fee_ (Resource::feeLightPeer) , fee_ (Resource::feeLightPeer)