From 5ad0ea4a00f1d28dc9fbf193ac7889e5a255d4cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Wed, 18 Mar 2015 17:12:13 -0400
Subject: [PATCH] ringdht: clarify dht status log
Refs #67228
Change-Id: Ibafba1dc263de6752da527cb3ee4c907ebbdaa32
---
daemon/src/ringdht/ringaccount.cpp | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/daemon/src/ringdht/ringaccount.cpp b/daemon/src/ringdht/ringaccount.cpp
index 9ad2194754..7b8d0f04f9 100644
--- a/daemon/src/ringdht/ringaccount.cpp
+++ b/daemon/src/ringdht/ringaccount.cpp
@@ -680,6 +680,14 @@ void RingAccount::doRegister()
doRegister_();
}
+
+static constexpr const char*
+dhtStatusStr(dht::Dht::Status status) {
+ return status == dht::Dht::Status::Connected ? "connected" : (
+ status == dht::Dht::Status::Connecting ? "connecting" :
+ "disconnected");
+}
+
void RingAccount::doRegister_()
{
try {
@@ -690,7 +698,7 @@ void RingAccount::doRegister_()
}
auto identity = loadIdentity();
dht_.run(dhtPortUsed_, identity.second, false, [=](dht::Dht::Status s4, dht::Dht::Status s6) {
- RING_WARN("Dht status : %d %d", (int)s4, (int)s6);
+ RING_WARN("Dht status : IPv4 %s; IPv6 %s", dhtStatusStr(s4), dhtStatusStr(s6));
auto status = std::max(s4, s6);
switch(status) {
case dht::Dht::Status::Connecting:
--
GitLab