mgmt+rib: improve logging
Change-Id: I2c8470831a9f9cbd5c06681f69783c4b442420f9
diff --git a/daemon/rib/route.cpp b/daemon/rib/route.cpp
index 5011290..642aa1e 100644
--- a/daemon/rib/route.cpp
+++ b/daemon/rib/route.cpp
@@ -35,13 +35,14 @@
computeExpiration(const ndn::PrefixAnnouncement& ann)
{
auto validityEnd = time::steady_clock::duration::max();
- if (ann.getValidityPeriod()) {
+ const auto& validityPeriod = ann.getValidityPeriod();
+ if (validityPeriod) {
auto now = time::system_clock::now();
- if (!ann.getValidityPeriod()->isValid(now)) {
+ if (!validityPeriod->isValid(now)) {
validityEnd = time::steady_clock::duration::zero();
}
else {
- validityEnd = ann.getValidityPeriod()->getPeriod().second - now;
+ validityEnd = validityPeriod->getPeriod().second - now;
}
}
return time::steady_clock::now() +
@@ -62,8 +63,8 @@
std::ostream&
operator<<(std::ostream& os, const Route& route)
{
- os << "Route("
- << "faceid: " << route.faceId
+ os << "Route{"
+ << "face: " << route.faceId
<< ", origin: " << route.origin
<< ", cost: " << route.cost
<< ", flags: " << ndn::AsHex{route.flags};
@@ -72,14 +73,14 @@
os << ", expires in: " << time::duration_cast<time::milliseconds>(*route.expires - time::steady_clock::now());
}
else {
- os << ", never expires";
+ os << ", expires: never";
}
if (route.announcement) {
os << ", announcement: (" << *route.announcement << ')';
}
- return os << ')';
+ return os << '}';
}
} // namespace nfd::rib