commit b3051652821adc77e04bd74e6e05e5a85232c9a7
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Apr 30 17:50:26 2014 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Apr 30 18:13:19 2014 -0700
tree da7a4f8b0e87d6ee14aa9e012bb5df520caf89b9
parent 55b8ed4b8556f5df9790ae798d4c1abcb5aa4c63

rib: Properly terminate when a critical error occurs

Change-Id: I0acd44d0f0bba808f8a049527708cf01a6f56eaa
Fixes: #1567

rib/rib-manager.cpp

diff --git a/rib/rib-manager.cpp b/rib/rib-manager.cpp
index 3db042d..73ef71d 100644
--- a/rib/rib-manager.cpp
+++ b/rib/rib-manager.cpp
@@ -130,8 +130,7 @@
 void
 RibManager::setInterestFilterFailed(const Name& name, const std::string& msg)
 {
-  NFD_LOG_ERROR("Error in setting interest filter (" << name << "): " << msg);
-  m_face.shutdown();
+  throw Error("Error in setting interest filter (" + name.toUri() + "): " + msg);
 }
 
 void
@@ -387,9 +386,10 @@
 void
 RibManager::onControlHeaderError(uint32_t code, const std::string& reason)
 {
-  NFD_LOG_ERROR("Error: couldn't enable local control header "
-                << "(code: " << code << ", info: " << reason << ")");
-  m_face.shutdown();
+  std::ostringstream os;
+  os << "Couldn't enable local control header "
+     << "(code: " << code << ", info: " << reason << ")";
+  throw Error(os.str());
 }
 
 void