Changeset 143 in pacpusframework

Timestamp:

07/30/13 18:16:04 (11 years ago)

Author:

Marek Kurdej

Message:

Update: Logger initialization invoked in DbitePlayer.

Location:

branches/2.0-beta1

Files:

• include/Pacpus/kernel/Log.h (modified) (1 diff)
• src/DBITEPlayer/src/main.cpp (modified) (1 diff)
• src/PacpusLib/Log.cpp (modified) (2 diffs)

branches/2.0-beta1/include/Pacpus/kernel/Log.h

@@ -28 +28 @@
 public:
     LogConfigurator();
+    ~LogConfigurator();
     static void configureLoggerWithFile(const char * configFilename);
 } logInitializer;

branches/2.0-beta1/src/DBITEPlayer/src/main.cpp

@@ -52 +52 @@
 int main(int argc, char * argv[])
 {
+    LogConfigurator::configureLoggerWithFile("DbitePlayer_%N.log");
+
     PacpusApplication app(argc, argv);
     ComponentManager * mgr = ComponentManager::getInstance();

branches/2.0-beta1/src/PacpusLib/Log.cpp

@@ -9 +9 @@
 #ifdef PACPUS_USE_LOG
 
+#include <boost/log/detail/date_time_format_parser.hpp>
+#include <boost/log/expressions.hpp>
+#include <boost/log/sinks/text_file_backend.hpp>
+#include <boost/log/sinks/text_ostream_backend.hpp>
+#include <boost/log/sources/severity_logger.hpp>
+#include <boost/log/sources/record_ostream.hpp>
+#include <boost/log/support/date_time.hpp>
+#include <boost/log/utility/setup/common_attributes.hpp>
+#include <boost/log/utility/setup/file.hpp>
+#include <boost/log/utility/setup/formatter_parser.hpp>
+#include <boost/log/utility/empty_deleter.hpp>
 #include <ostream>
 #include <QString>
@@ -23 +34 @@
 PACPUSLIB_API std::basic_ostream<char>& operator<< (std::basic_ostream<char>& strm, QString const& s);
 
-#endif // PACPUS_USE_LOG
-
 namespace pacpus {
    
-#if defined(PACPUS_USE_LOG)
-
-//#include <boost/log/utility/setup/formatter_parser.hpp>
-
 void init_log_factories()
 {
-    //boost::log::register_simple_formatter_factory< QString, char >("QString");
+    boost::log::register_simple_formatter_factory< QString, char >("QString");
 }
 
-#endif // PACPUS_USE_LOG
+static int niftyCounter;
 
 LogConfigurator::LogConfigurator()
 {
-#if defined(PACPUS_USE_LOG)
-    init_log_factories();
-#endif // PACPUS_USE_LOG
+    if (0 == niftyCounter++) {
+        init_log_factories();
+    }
 }
 
-void LogConfigurator::configureLoggerWithFile(const char * /*configFilename*/)
+LogConfigurator::~LogConfigurator()
 {
+    if (0 == --niftyCounter) {
+        // clean up
+    }
+}
+
+void LogConfigurator::configureLoggerWithFile(const char * logFileName)
+{
+    using namespace boost;
+
+    namespace logging = boost::log;
+    namespace sinks = boost::log::sinks;
+    namespace src = boost::log::sources;
+    namespace expr = boost::log::expressions;
+    namespace attrs = boost::log::attributes;
+    namespace keywords = boost::log::keywords;
+    
+    logging::add_common_attributes();
+    logging::core::get()->set_filter
+    (
+        logging::trivial::severity >= logging::trivial::debug
+    );
+
+    // Add a file log
+    logging::add_file_log
+    (
+        keywords::file_name = logFileName,
+        keywords::rotation_size = 10 * 1024 * 1024,
+        keywords::time_based_rotation = sinks::file::rotation_at_time_point(0, 0, 0),
+        //keywords::format = "%LineID% [%TimeStamp%]: %Message%"
+        keywords::format =
+        (
+            expr::stream
+                << std::setfill('0') << std::setw(6) << expr::attr< unsigned int >("LineID")
+                //<< " [" << expr::format_date_time< posix_time::ptime >("TimeStamp", date_time::iso_extended_format) << "] "
+                << " [" << expr::format_date_time< posix_time::ptime >("TimeStamp", "%Y-%m-%d %T.%f") << "] "
+                << "<" << logging::trivial::severity << ">"
+                << " "
+                << expr::smessage
+        )
+    );
+
+    // Create a backend and attach a couple of streams to it
+    boost::shared_ptr< sinks::text_ostream_backend > backend =
+        make_shared< sinks::text_ostream_backend >(
+            //keywords::format = "[%TimeStamp%]: %Message%"
+        );
+    backend->add_stream(
+        shared_ptr< std::ostream >(&std::clog, logging::empty_deleter())
+    );
+
+    // Enable auto-flushing after each log record written
+    backend->auto_flush(true);
+
+    // Wrap it into the frontend and register in the core.
+    // The backend requires synchronization in the frontend.
+    typedef sinks::synchronous_sink< sinks::text_ostream_backend > sink_t;
+    shared_ptr< sink_t > sink(new sink_t(backend));
+    sink->set_filter
+    (
+        logging::trivial::severity >= logging::trivial::info
+    );
+    sink->set_formatter
+    (
+        expr::stream
+            << std::setfill('0') << std::setw(6) << expr::attr< unsigned int >("LineID")
+            //<< " [" << expr::format_date_time< posix_time::ptime >("TimeStamp", date_time::iso_extended_format) << "] "
+            << " [" << expr::format_date_time< posix_time::ptime >("TimeStamp", "%Y-%m-%d %T.%f") << "] "
+            << "<" << logging::trivial::severity << ">"
+            << " "
+            << expr::smessage
+    );
+
+    logging::core::get()->add_sink(sink);
+
+    BOOST_LOG_TRIVIAL(info) << "logger initialised";
 }
 
 } // namespace pacpus
+
+#else // PACPUS_USE_LOG
+
+namespace pacpus
+
+    LogConfigurator::LogConfigurator()
+    {}
+    void LogConfigurator::configureLoggerWithFile(const char * /*configFilename*/)
+    {}
+
+} // namespace pacpus
+
+#endif // PACPUS_USE_LOG