commit cfb80c704bc12456240bde848a6dd8dec588daae
author Chengyu Fan <chengy.fan@gmail.com> Mon Oct 19 16:50:04 2015 -0600
committer Chengyu Fan <chengy.fan@gmail.com> Mon Oct 19 16:50:25 2015 -0600
tree e98b61427e85939f98ade61cfdbda8df44f13eb5
parent 612f11cecea103da4f351b3038bc89ac595e5e7d

base catalog version on ChronoSync

* remove the redundant TableColumns in publishAdapter
* share chonosync::Socket in adapters to allow queryAdapter to use digest as version
* add various levels of log messages

refs: #2770

Change-Id: Id5aca0f84d9b7963fc63bf0329fbc6394f2b5777

catalog/src/util/catalog-adapter.hpp

diff --git a/catalog/src/util/catalog-adapter.hpp b/catalog/src/util/catalog-adapter.hpp
index 7c04c83..04b101d 100644
--- a/catalog/src/util/catalog-adapter.hpp
+++ b/catalog/src/util/catalog-adapter.hpp
@@ -56,8 +56,8 @@
 
   /**
    * Constructor
-   * @param face:      Face that will be used for NDN communications
-   * @param keyChain:  KeyChain that will be used for data signing
+   * @param face:       Face that will be used for NDN communications
+   * @param keyChain:   KeyChain that will be used for data signing
    */
   CatalogAdapter(const std::shared_ptr<ndn::Face>& face,
                  const std::shared_ptr<ndn::KeyChain>& keyChain);

catalog/src/util/logger.hpp

diff --git a/catalog/src/util/logger.hpp b/catalog/src/util/logger.hpp
index 3e2d8dd..f7c66f0 100644
--- a/catalog/src/util/logger.hpp
+++ b/catalog/src/util/logger.hpp
@@ -34,6 +34,9 @@
 #define INIT_LOGGER(name) \
   static log4cxx::LoggerPtr staticModuleLogger = log4cxx::Logger::getLogger(name)
 
+#define _LOG_INFO(x) \
+  LOG4CXX_INFO(staticModuleLogger, x)
+
 #define _LOG_DEBUG(x) \
   LOG4CXX_DEBUG(staticModuleLogger, x)
 
@@ -49,6 +52,9 @@
 #define _LOG_ERROR(x) \
   LOG4CXX_ERROR(staticModuleLogger, x)
 
+#define _LOG_FATAL(x) \
+  LOG4CXX_FATAL(staticModuleLogger, x)
+
 #else // HAVE_LOG4CXX
 
 #define INIT_LOGGER(name)
@@ -56,7 +62,8 @@
 #define _LOG_FUNCTION_NOARGS
 #define _LOG_TRACE(x)
 #define INIT_LOGGERS(x)
-#define _LOG_ERROR(x)
+#define _LOG_ERROR(x) \
+  std::cerr << x << std::endl
 
 #ifdef _DEBUG
 
@@ -65,13 +72,18 @@
 #include <ndn-cxx/util/time.hpp>
 
 // to print out messages, must be in debug mode
+
 #define _LOG_DEBUG(x) \
-  std::clog << ndn::time::system_clock::now() << " " << std::this_thread::get_id() << \
-               " " << x << std::endl
+  std::clog << ndn::time::system_clock::now() << " " << x << std::endl
+
+#define _LOG_FATAL(x) \
+  std::clog << ndn::time::system_clock::now() << " " << x << std::endl
+
 
 #else // _DEBUG
 
 #define _LOG_DEBUG(x)
+#define _LOG_FATAL(x)
 
 #endif // _DEBUG