make format

pull/1312/head
Stephen Shelton 4 years ago
parent 8628212269
commit 0ecdda7a89
No known key found for this signature in database
GPG Key ID: EE4BADACCE8B631C

@ -86,15 +86,14 @@ namespace llarp
if (m_peerDb) if (m_peerDb)
peerStatsObj = m_peerDb->ExtractStatus(); peerStatsObj = m_peerDb->ExtractStatus();
return util::StatusObject{ return util::StatusObject{{"running", true},
{"running", true}, {"numNodesKnown", _nodedb->num_loaded()},
{"numNodesKnown", _nodedb->num_loaded()}, {"dht", _dht->impl->ExtractStatus()},
{"dht", _dht->impl->ExtractStatus()}, {"services", _hiddenServiceContext.ExtractStatus()},
{"services", _hiddenServiceContext.ExtractStatus()}, {"exit", _exitContext.ExtractStatus()},
{"exit", _exitContext.ExtractStatus()}, {"links", _linkManager.ExtractStatus()},
{"links", _linkManager.ExtractStatus()}, {"outboundMessages", _outboundMessageHandler.ExtractStatus()},
{"outboundMessages", _outboundMessageHandler.ExtractStatus()}, {"peerStats", peerStatsObj}};
{"peerStats", peerStatsObj}};
} }
else else
{ {

@ -51,7 +51,6 @@ namespace llarp
{ {
struct Router final : public AbstractRouter struct Router final : public AbstractRouter
{ {
llarp_time_t _lastPump = 0s; llarp_time_t _lastPump = 0s;
bool ready; bool ready;
// transient iwp encryption key // transient iwp encryption key

@ -163,9 +163,8 @@ namespace tooling
llarp::AbstractRouter* llarp::AbstractRouter*
RouterHive::GetRelay(const llarp::RouterID& id, bool needMutexLock) RouterHive::GetRelay(const llarp::RouterID& id, bool needMutexLock)
{ {
auto guard = needMutexLock auto guard =
? std::make_optional<std::lock_guard<std::mutex>>(routerMutex) needMutexLock ? std::make_optional<std::lock_guard<std::mutex>>(routerMutex) : std::nullopt;
: std::nullopt;
auto itr = relays.find(id); auto itr = relays.find(id);
if (itr == relays.end()) if (itr == relays.end())

@ -17,7 +17,7 @@ namespace llarp
{ {
struct Context; struct Context;
struct AbstractRouter; struct AbstractRouter;
} } // namespace llarp
namespace tooling namespace tooling
{ {
@ -30,9 +30,7 @@ namespace tooling
StartRouters(bool isRelay); StartRouters(bool isRelay);
void void
AddRouter( AddRouter(const std::shared_ptr<llarp::Config>& config, bool isRelay);
const std::shared_ptr<llarp::Config>& config,
bool isRelay);
/// safely visit router /// safely visit router
void void

Loading…
Cancel
Save