Changeset 7727 for source/ariba

Timestamp:

Mar 9, 2010, 1:23:20 PM (14 years ago)

Author:

stud-florian

Message:

Added support for compiling without log4cxx. If log4cxx is not present, all logging is sent directly to stdout.

Location:

source/ariba/utility

Files:

• logging/Logging.h (modified) (2 diffs)
• system/StartupWrapper.cpp (modified) (3 diffs)

source/ariba/utility/logging/Logging.h

@@ -42 +42 @@
 #include <iostream>
 #include <cstdlib>
+
+#ifdef HAVE_LOG4CXX_LOGGER_H
 #include <log4cxx/logger.h>
 #include <log4cxx/basicconfigurator.h>
-
+#endif // HAVE_LOG4CXX_LOGGER_H
 
 #ifdef LOGCOLORS
@@ -64 +66 @@
 #endif // ENABLE_LOGCOLORS
 
-#define use_logging_h(x) \
-        private: static log4cxx::LoggerPtr logger;
 
-#define use_logging_cpp(x) \
+#ifdef HAVE_LOG4CXX_LOGGER_H
+
+  #define use_logging_h(x) \
+        private: static log4cxx::LoggerPtr logger;
+
+  #define use_logging_cpp(x) \
         log4cxx::LoggerPtr x::logger(log4cxx::Logger::getLogger(#x));
 
-#define logging_trace(x)  {            LOG4CXX_TRACE(logger,x);                         }
-#define logging_debug(x)  {colorDebug; LOG4CXX_DEBUG(logger,x); colorDefault;           }
-#define logging_info(x)   {colorInfo;  LOG4CXX_INFO(logger,x);  colorDefault;           }
-#define logging_warn(x)   {colorWarn;  LOG4CXX_WARN(logger,x);  colorDefault;           }
-#define logging_error(x)  {colorError; LOG4CXX_ERROR(logger,x); colorDefault;           }
-#define logging_fatal(x)  {colorError; LOG4CXX_FATAL(logger,x); colorDefault; exit(-1); }
+  #define logging_trace(x)  {            LOG4CXX_TRACE(logger,x);                         }
+  #define logging_debug(x)  {colorDebug; LOG4CXX_DEBUG(logger,x); colorDefault;           }
+  #define logging_info(x)   {colorInfo;  LOG4CXX_INFO(logger,x);  colorDefault;           }
+  #define logging_warn(x)   {colorWarn;  LOG4CXX_WARN(logger,x);  colorDefault;           }
+  #define logging_error(x)  {colorError; LOG4CXX_ERROR(logger,x); colorDefault;           }
+  #define logging_fatal(x)  {colorError; LOG4CXX_FATAL(logger,x); colorDefault; exit(-1); }
+
+#else // HAVE_LOG4CXX_LOGGER_H
+
+  #define use_logging_h(x)
+
+  #define use_logging_cpp(x)
+
+  #define logging_stdout(x) std::cout << x << std::endl;
+
+  #define logging_trace(x)
+  #define logging_debug(x)  {colorDebug; logging_stdout(x); colorDefault;           }
+  #define logging_info(x)   {colorInfo;  logging_stdout(x);  colorDefault;           }
+  #define logging_warn(x)   {colorWarn;  logging_stdout(x);  colorDefault;           }
+  #define logging_error(x)  {colorError; logging_stdout(x); colorDefault;           }
+  #define logging_fatal(x)  {colorError; logging_stdout(x); colorDefault; exit(-1); }
+
+#endif // HAVE_LOG4CXX_LOGGER_H
 
 #endif //LOGGING_H__

source/ariba/utility/system/StartupWrapper.cpp

@@ -39 +39 @@
 #include "StartupWrapper.h"
 #include "ariba/config.h"
+
+#ifdef HAVE_LOG4CXX_LOGGER_H
+#include <log4cxx/logger.h>
+#include <log4cxx/basicconfigurator.h>
+#endif // HAVE_LOG4CXX_LOGGER_H
 
 namespace ariba {
@@ -93 +98 @@
         // configure the logging
         //
-
+        
+#ifdef HAVE_LOG4CXX_LOGGER_H
         log4cxx::BasicConfigurator::configure();
 
@@ -109 +115 @@
         }
 #endif //HAVE_MAEMO
+#endif //HAVE_LOG4CXX_LOGGER_H
 }