commit d374c406b28a0dfb5274fbd61e7cbab5f8c02b0e
author Spyridon Mastorakis <spiros.mastorakis@gmail.com> Wed Sep 09 15:07:00 2015 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sun Sep 27 11:36:42 2015 -0700
tree 5984fd166b74cd4cff84f3ed00bd04a3b2387e6c
parent 259d0d876f3ccbbb98d4aa7c732a2e371cb66185

daemon: display extended exception information in top-level catch

Change-Id: I471023fc23ffaebe04d9668426b4c1b03e4912cb
Refs: #2541

core/extended-error-message.hpp

diff --git a/core/extended-error-message.hpp b/core/extended-error-message.hpp
new file mode 100644
index 0000000..10e62e2
--- /dev/null
+++ b/core/extended-error-message.hpp
@@ -0,0 +1,56 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/**
+ * Copyright (c) 2014-2015,  Regents of the University of California,
+ *                           Arizona Board of Regents,
+ *                           Colorado State University,
+ *                           University Pierre & Marie Curie, Sorbonne University,
+ *                           Washington University in St. Louis,
+ *                           Beijing Institute of Technology,
+ *                           The University of Memphis.
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NFD_CORE_EXTENDED_ERROR_MESSAGE_HPP
+#define NFD_CORE_EXTENDED_ERROR_MESSAGE_HPP
+
+#include <boost/exception/get_error_info.hpp>
+
+namespace nfd {
+
+template<typename E>
+std::string
+getExtendedErrorMessage(const E& exception)
+{
+  std::ostringstream errorMessage;
+  errorMessage << exception.what();
+
+  const char* const* file = boost::get_error_info<boost::throw_file>(exception);
+  const int* line = boost::get_error_info<boost::throw_line>(exception);
+  const char* const* func = boost::get_error_info<boost::throw_function>(exception);
+  if (file && line) {
+    errorMessage << " [from " << *file << ":" << *line;
+    if (func) {
+      errorMessage << " in " << *func;
+    }
+    errorMessage << "]";
+  }
+
+  return errorMessage.str();
+}
+
+} // namespace nfd
+
+#endif // NFD_CORE_EXTENDED_ERROR_MESSAGE_HPP

daemon/main.cpp

diff --git a/daemon/main.cpp b/daemon/main.cpp
index 6646240..a73dd09 100644
--- a/daemon/main.cpp
+++ b/daemon/main.cpp
@@ -30,6 +30,7 @@
 #include "core/global-io.hpp"
 #include "core/logger.hpp"
 #include "core/privilege-helper.hpp"
+#include "core/extended-error-message.hpp"
 
 #include <string.h>
 
@@ -278,12 +279,12 @@
       return 3;
     }
     else {
-      NFD_LOG_FATAL(e.what());
+      NFD_LOG_FATAL(getExtendedErrorMessage(e));
       return 2;
     }
   }
   catch (const std::exception& e) {
-    NFD_LOG_FATAL(e.what());
+    NFD_LOG_FATAL(getExtendedErrorMessage(e));
     return 2;
   }
   catch (const PrivilegeHelper::Error& e) {