commit 9c9c3011317f615c1051bd0021b584df926aa238
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Jan 25 23:44:25 2013 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Jan 25 23:44:25 2013 -0800
tree 259f315c19a360fa0a3b4a4cf56f45ec3fac46f4
parent 95160100432b58d59cd01a528a20b34676068572

Don't throw exception in ccnLoop, put just log, sleep, and continue

ccnx/ccnx-wrapper.cpp

diff --git a/ccnx/ccnx-wrapper.cpp b/ccnx/ccnx-wrapper.cpp
index f5d20c0..697901c 100644
--- a/ccnx/ccnx-wrapper.cpp
+++ b/ccnx/ccnx-wrapper.cpp
@@ -31,6 +31,10 @@
 #include <boost/algorithm/string.hpp>
 #include <sstream>
 
+#include "logging.h"
+
+INIT_LOGGER ("Ccnx.Wrapper");
+
 typedef boost::error_info<struct tag_errmsg, std::string> errmsg_info_str;
 typedef boost::error_info<struct tag_errmsg, int> errmsg_info_int;
 
@@ -104,9 +108,13 @@
 
           if (!m_running) break;
 
-          if (res < 0)
-            BOOST_THROW_EXCEPTION (CcnxOperationException()
-                                 << errmsg_info_str("ccn_run returned error"));
+          if (res < 0) {
+            _LOG_ERROR ("ccn_run returned negative status: " << res);
+            usleep (100000);
+            continue;
+            // BOOST_THROW_EXCEPTION (CcnxOperationException()
+            //                     << errmsg_info_str("ccn_run returned error"));
+          }
 
 
           pollfd pfds[1];

wscript

diff --git a/wscript b/wscript
index 2300f7f..52d14b8 100644
--- a/wscript
+++ b/wscript
@@ -11,7 +11,7 @@
     opt.add_option('--yes',action='store_true',default=False) # for autoconf/automake/make compatibility
     opt.add_option('--log4cxx', action='store_true',default=False,dest='log4cxx',help='''Compile with log4cxx logging support''')
 
-    opt.load('compiler_cxx boost ccnx protoc ice_cxx qt4')
+    opt.load('compiler_cxx boost ccnx protoc qt4')
 
 def configure(conf):
     conf.load("compiler_cxx")
@@ -39,7 +39,6 @@
     conf.load ('ccnx')
 
     conf.load('protoc')
-    conf.load('ice_cxx')
 
     conf.load('qt4')
 
@@ -81,7 +80,7 @@
         features=['cxx'],
         source = bld.path.ant_glob(['ccnx/**/*.cc', 'ccnx/**/*.cpp']),
         use = 'BOOST BOOST_THREAD SSL CCNX LOG4CXX scheduler',
-        includes = "ccnx scheduler",
+        includes = "ccnx src scheduler",
         )
 
     chornoshare = bld (
@@ -129,5 +128,5 @@
 	defines = "WAF",
 	source = bld.path.ant_glob(['gui/*.cpp', 'gui/*.cc', 'gui/*.qrc']),
 	includes = "ccnx scheduler src gui src . ",
-	use = "QTCORE QTGUI LOG4CXX fs-watcher ccnx database chronoshare"
+	use = "BOOST BOOST_FILESYSTEM SQLITE3 QTCORE QTGUI LOG4CXX fs-watcher ccnx database chronoshare"
 	)