Changeset 176 in pacpusframework for trunk/include/Pacpus/kernel/Log.h

Timestamp:

10/11/13 14:10:06 (11 years ago)

Author:

Marek Kurdej

Message:

Added: addParameters() method in ComponentBase using Boost.Program_Options.
Each component can declare its parameters and they will be read automatically before configureComponent() method.
See example ProducerConsumerExample constructors.

File:

• trunk/include/Pacpus/kernel/Log.h (modified) (1 diff)

trunk/include/Pacpus/kernel/Log.h

@@ -35 +35 @@
 
 #if defined(PACPUS_USE_LOG)
+#   include <boost/log/attributes/named_scope.hpp>
+#   include <boost/log/trivial.hpp>
+#   include <iosfwd>
 
-#include <boost/log/trivial.hpp>
-#include <iosfwd>
 class QString;
-
 template< typename CharT, typename TraitsT >
 PACPUSLIB_API std::basic_ostream< CharT, TraitsT >& operator<< (std::basic_ostream< CharT, TraitsT >& strm, QString const& s);
 
-#define DECLARE_STATIC_LOGGER(name) 
-
-#define LOG(level, message)         BOOST_LOG_TRIVIAL(level) << message
-#define LOG_TRACE(message)          LOG(trace, message)
-#define LOG_DEBUG(message)          LOG(debug, message)
-#define LOG_INFO(message)           LOG(info, message)
-#define LOG_WARN(message)           LOG(warning, message)
-#define LOG_ERROR(message)          LOG(error, message)
-#define LOG_FATAL(message)          LOG(fatal, message)
-
+#   define DECLARE_STATIC_LOGGER(name)        //BOOST_LOG_NAMED_SCOPE(name)
+#   define PACPUS_LOG_FUNCTION()              BOOST_LOG_FUNCTION()
+#   define PACPUS_LOG_NAMED_SCOPE(name)       BOOST_LOG_NAMED_SCOPE(name)
+#   define PACPUS_LOG(level, message)         BOOST_LOG_TRIVIAL(level) << message
 #else
-
 /// @param name Name of the logger, displayed when logging a message.
-#define DECLARE_STATIC_LOGGER(name)
-/// Logs a message at TRACE level using default logger
-#define LOG_TRACE(message)
-/// Logs a message at DEBUG level using default logger
-#define LOG_DEBUG(message)
-/// Logs a message at INFO level using default logger
-#define LOG_INFO(message)
-/// Logs a message at WARN level using default logger
-#define LOG_WARN(message)
-/// Logs a message at ERROR level using default logger
-#define LOG_ERROR(message)
-/// Logs a message at FATAL level using default logger
-#define LOG_FATAL(message)
-
+#   define DECLARE_STATIC_LOGGER(name)
+#   define PACPUS_LOG_FUNCTION()              ((void) 0)
+#   define PACPUS_LOG_NAMED_SCOPE(name)       ((void) 0)
+#   define PACPUS_LOG(level, message)         ((void) 0)
 #endif // PACPUS_USE_LOG
 
+/// Logs a message at TRACE level using default logger
+#define LOG_TRACE(message)          PACPUS_LOG(trace, message)
+/// Logs a message at DEBUG level using default logger
+#define LOG_DEBUG(message)          PACPUS_LOG(debug, message)
+/// Logs a message at INFO level using default logger
+#define LOG_INFO(message)           PACPUS_LOG(info, message)
+/// Logs a message at WARN level using default logger
+#define LOG_WARN(message)           PACPUS_LOG(warning, message)
+/// Logs a message at ERROR level using default logger
+#define LOG_ERROR(message)          PACPUS_LOG(error, message)
+/// Logs a message at FATAL level using default logger
+#define LOG_FATAL(message)          PACPUS_LOG(fatal, message)
+
 #endif // DEF_PACPUS_LOG_H