Changeset 236 in pacpusframework for trunk/include/Pacpus

Timestamp:

Nov 28, 2013, 5:07:16 PM (11 years ago)

Author:

Marek Kurdej

Message:

Experimental: using global logger object instead of trivial logger. Added: stub for colored log output on Linux.

File:

• trunk/include/Pacpus/kernel/Log.h (modified) (4 diffs)

trunk/include/Pacpus/kernel/Log.h

@@ -17 +17 @@
 #include <Pacpus/kernel/PacpusLibConfig.h>
 
-namespace pacpus {
+namespace pacpus
+{
 
 /// Static log facility initializer
@@ -34 +35 @@
 
 #if defined(PACPUS_USE_LOG)
+#   include <boost/log/common.hpp>
 #   include <boost/log/attributes/named_scope.hpp>
-#   include <boost/log/trivial.hpp>
+#   include <boost/log/core.hpp>
+#   include <boost/log/sources/record_ostream.hpp>
+#   include <boost/log/sources/severity_logger.hpp>
 #   include <iosfwd>
+
+namespace pacpus
+{
+    /// Trivial severity levels
+    /*PACPUSLIB_API*/ enum SeverityLevel
+    {
+        trace,
+        debug,
+        info,
+        warning,
+        error,
+        fatal
+    };
+
+    BOOST_LOG_INLINE_GLOBAL_LOGGER_DEFAULT(gLogger, ::boost::log::sources::severity_logger_mt< ::pacpus::SeverityLevel>)
+
+} // namespace pacpus
 
 class QString;
@@ -45 +66 @@
 #   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
+#   define PACPUS_LOG(level, message)         BOOST_LOG_SEV( ::pacpus::gLogger::get(), level) << message
 #else
 /// @param name Name of the logger, displayed when logging a message.
@@ -55 +76 @@
 
 /// Logs a message at TRACE level using default logger
-#define LOG_TRACE(message)          PACPUS_LOG(trace, message)
+#define LOG_TRACE(message)          PACPUS_LOG( ::pacpus::trace, message)
 /// Logs a message at DEBUG level using default logger
-#define LOG_DEBUG(message)          PACPUS_LOG(debug, message)
+#define LOG_DEBUG(message)          PACPUS_LOG( ::pacpus::debug, message)
 /// Logs a message at INFO level using default logger
-#define LOG_INFO(message)           PACPUS_LOG(info, message)
+#define LOG_INFO(message)           PACPUS_LOG( ::pacpus::info, message)
 /// Logs a message at WARN level using default logger
-#define LOG_WARN(message)           PACPUS_LOG(warning, message)
+#define LOG_WARN(message)           PACPUS_LOG( ::pacpus::warning, message)
 /// Logs a message at ERROR level using default logger
-#define LOG_ERROR(message)          PACPUS_LOG(error, message)
+#define LOG_ERROR(message)          PACPUS_LOG( ::pacpus::error, message)
 /// Logs a message at FATAL level using default logger
-#define LOG_FATAL(message)          PACPUS_LOG(fatal, message)
+#define LOG_FATAL(message)          PACPUS_LOG( ::pacpus::fatal, message)
 
 #endif // DEF_PACPUS_LOG_H