Request Watchdog logging updates

Signed-off-by: Justin Dickow <jjdickow@gmail.com>

diff --git a/src/components/request_watchdog/CMakeLists.txt b/src/components/request_watchdog/CMakeLists.txt
index fe88560..f4e9f2a 100644 (file)
--- a/src/components/request_watchdog/CMakeLists.txt
+++ b/src/components/request_watchdog/CMakeLists.txt
@@ -12,4 +12,4 @@ set (SOURCES
 )
 
 add_library("RequestWatchdog" ${SOURCES})
-target_link_libraries ("RequestWatchdog" Utils)
+target_link_libraries("RequestWatchdog" Utils)

diff --git a/src/components/request_watchdog/include/request_watchdog/request_watchdog.h b/src/components/request_watchdog/include/request_watchdog/request_watchdog.h
index 0310f84..8fea376 100644 (file)
--- a/src/components/request_watchdog/include/request_watchdog/request_watchdog.h
+++ b/src/components/request_watchdog/include/request_watchdog/request_watchdog.h
@@ -39,7 +39,6 @@
 #include <list>
 #include <map>
 #include "request_watchdog/watchdog.h"
-#include "utils/logger.h"
 #include "utils/threads/thread.h"
 #include "utils/threads/thread_delegate.h"
 #include "utils/date_time.h"
@@ -212,7 +211,6 @@ class RequestWatchdog : public Watchdog {
     };
 
     static const int32_t                  DEFAULT_CYCLE_TIMEOUT = 250000;
-    static log4cxx::LoggerPtr             logger_;
     std::list<WatchdogSubscriber*>        subscribers_;
     sync_primitives::Lock                 subscribersLock_;
     std::map<RequestInfo*, TimevalStruct> requests_;

diff --git a/src/components/request_watchdog/src/request_watchdog.cc b/src/components/request_watchdog/src/request_watchdog.cc
index b7396dc..b658c07 100644 (file)
--- a/src/components/request_watchdog/src/request_watchdog.cc
+++ b/src/components/request_watchdog/src/request_watchdog.cc
@@ -40,16 +40,15 @@
 #include <functional>
 #include <map>
 #include "request_watchdog/request_watchdog.h"
+#include "utils/logger.h"
 
 namespace request_watchdog {
 using namespace sync_primitives;
 
 const int32_t RequestWatchdog::DEFAULT_CYCLE_TIMEOUT;
 
-#ifdef ENABLE_LOG
-log4cxx::LoggerPtr RequestWatchdog::logger_ =
-  log4cxx::LoggerPtr(log4cxx::Logger::getLogger("RequestWatchdog"));
-#endif // ENABLE_LOG
+CREATE_LOGGERPTR_GLOBAL(logger_, "RequestWatchdog")
+
 /*
 Watchdog* RequestWatchdog::instance() {
   static RequestWatchdog instnc;