commit 66ff0989c59c557c60a75dc1afd109313e39bba1
author Davide Pesavento <davide.pesavento@lip6.fr> Thu Jan 29 22:39:00 2015 +0100
committer Davide Pesavento <davide.pesavento@lip6.fr> Mon Feb 02 17:59:02 2015 +0100
tree a4ffc3ffd3380fa2bcabdca010c0c32f6d20055d
parent e46279dc8382316fb933697346b66f22cad1ee5e

face: cleanup log messages in all faces and print fail reason

Change-Id: I405198b375a0317663d29810ee87922a19edccaa
Refs: #2450

daemon/face/udp-face.cpp

diff --git a/daemon/face/udp-face.cpp b/daemon/face/udp-face.cpp
index 17214c5..53dc374 100644
--- a/daemon/face/udp-face.cpp
+++ b/daemon/face/udp-face.cpp
@@ -27,6 +27,8 @@
 // #include "core/global-io.hpp" // for #1718 manual test below
 
 #ifdef __linux__
+#include <cerrno>       // for errno
+#include <cstring>      // for std::strerror()
 #include <netinet/in.h> // for IP_MTU_DISCOVER and IP_PMTUDISC_DONT
 #include <sys/socket.h> // for setsockopt()
 #endif
@@ -61,9 +63,8 @@
   if (::setsockopt(socket->native_handle(), IPPROTO_IP,
                    IP_MTU_DISCOVER, &value, sizeof(value)) < 0)
     {
-      NFD_LOG_WARN("[id:" << this->getId()
-                   << ",uri:" << this->getRemoteUri()
-                   << "] Failed to disable path MTU discovery");
+      NFD_LOG_WARN("[id:" << this->getId() << ",uri:" << this->getRemoteUri()
+                   << "] Failed to disable path MTU discovery: " << std::strerror(errno));
     }
 #endif
 
@@ -81,7 +82,8 @@
 ndn::nfd::FaceStatus
 UdpFace::getFaceStatus() const
 {
-  ndn::nfd::FaceStatus status = Face::getFaceStatus();
+  auto status = Face::getFaceStatus();
+
   if (isOnDemand()) {
     time::milliseconds left = m_idleTimeout - time::duration_cast<time::milliseconds>(
       time::steady_clock::now() - m_lastIdleCheck);
@@ -95,6 +97,7 @@
       status.setExpirationPeriod(left);
     }
   }
+
   return status;
 }
 
@@ -105,12 +108,7 @@
   // (non-on-demand -> on-demand transition is not allowed)
   if (isOnDemand()) {
     if (!hasBeenUsedRecently()) {
-      // face has been idle since the last time closeIfIdle
-      // has been called. Going to close it
-      NFD_LOG_DEBUG("Found idle face id: " << getId());
-
-      NFD_LOG_INFO("[id:" << this->getId()
-                   << ",uri:" << this->getRemoteUri()
+      NFD_LOG_INFO("[id:" << this->getId() << ",uri:" << this->getRemoteUri()
                    << "] Idle for more than " << m_idleTimeout << ", closing");
       close();