commit 49e2e4cbbf759d9fe7338e8ce95735a51e590768
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sat May 06 13:42:57 2017 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sat May 06 13:42:57 2017 -0700
tree fb04c7bccec79edb8566e1e8de286ff974abc103
parent b1ba9c9e3555efd91e17e06454f44e014e9d6a9c

A few code reorganizations

Change-Id: If4632fecc7085e5448226c2061e08546757eda9b

daemon/main.cpp

diff --git a/daemon/main.cpp b/daemon/main.cpp
index ee8c9fd..57ad8ba 100644
--- a/daemon/main.cpp
+++ b/daemon/main.cpp
@@ -19,6 +19,7 @@
  * DeLorean, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "common.hpp"
 #include "../core/logger.hpp"
 
 #include <boost/program_options/options_description.hpp>
@@ -26,7 +27,6 @@
 #include <boost/program_options/parsers.hpp>
 #include <boost/filesystem.hpp>
 
-
 int
 main(int argc, char** argv)
 {
@@ -62,11 +62,11 @@
   if (vm.count("config") == 0) {
 
     if (!getenv("HOME")) {
-      configFile = "/usr/local/etc/ndn/nsl.conf";
+      configFile = NDN_DELOREAN_DEFAULT_CONFIG_FILE;
     }
     else {
       configFile = getenv("HOME");
-      configFile += "/.ndn/nsl.conf";
+      configFile += "/.ndn/ndn-delorean.conf";
     }
 
     if (!fs::exists(fs::path(configFile))) {
@@ -77,7 +77,7 @@
 
   try {
     ndn::Face face;
-    nsl::Logger(face, configFile);
+    ndn::delorean::Logger(face, configFile);
     face.processEvents();
   }
   catch (std::runtime_error& e) {