From 694709f3925796a363792871f0453a4f36679c71 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Mon, 4 Dec 2017 19:21:56 -0500 Subject: [PATCH] Add timestamp to network status. --- controller/RethinkDB.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/controller/RethinkDB.cpp b/controller/RethinkDB.cpp index 00c17d2b3..297d2c7de 100644 --- a/controller/RethinkDB.cpp +++ b/controller/RethinkDB.cpp @@ -275,17 +275,18 @@ RethinkDB::RethinkDB(EmbeddedNetworkController *const nc,const Address &myAddres std::lock_guard l2(i->second->lock); tmpobj["authorizedMemberCount"] = i->second->authorizedMembers.size(); tmpobj["totalMemberCount"] = i->second->members.size(); - unsigned long activeMemberCount = 0; + unsigned long onlineMemberCount = 0; for(auto m=i->second->members.begin();m!=i->second->members.end();++m) { auto lo = lastOnlineCumulative.find(std::pair(i->first,m->first)); if (lo != lastOnlineCumulative.end()) { if ((now - lo->second) <= (ZT_NETWORK_AUTOCONF_DELAY * 2)) - ++activeMemberCount; + ++onlineMemberCount; else lastOnlineCumulative.erase(lo); } } - tmpobj["activeMemberCount"] = activeMemberCount; + tmpobj["onlineMemberCount"] = onlineMemberCount; tmpobj["bridgeCount"] = i->second->activeBridgeMembers.size(); + tmpobj["ts"] = now; } batch.emplace_back(tmpobj); if (batch.size() >= 1024) {