Changeset 141 in pacpusframework for branches/2.0-beta1/src/PacpusLib

Timestamp:

Jul 30, 2013, 5:48:06 PM (11 years ago)

Author:

Marek Kurdej

Message:

Major update: using Boost.Log if PACPUS_USE_LOG is true.
Added: overloaded operator<< for QString (explicit instantiation).

Location:

branches/2.0-beta1/src/PacpusLib

Files:

• ComponentManager.cpp (modified) (3 diffs)
• Log.cpp (modified) (2 diffs)
• PacpusApplication.cpp (modified) (1 diff)

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

@@ -343 +343 @@
 
     LOG_INFO("starting component '" << componentName << "'...");
-    if (!component->startComponent())
+    if (!component->startComponent()) {
         LOG_WARN("cannot start component '" << componentName << "'. It can already be started");
+    }
 
     return true;
@@ -372 +373 @@
 
     LOG_INFO("stopping component '" << componentName << "'...");
-    if (!component->stopComponent())
+    if (!component->stopComponent()) {
         LOG_WARN("cannot stop component '" << componentName << "'" << ". It can be already stopped");
+    }
 
     return true;
@@ -383 +385 @@
 
     ComponentMap::iterator it = componentMap_.find(name);
-    if (it != componentMap_.end())
+    if (it != componentMap_.end()) {
         return *it;
+    }
 
     LOG_WARN("cannot retrieve component '" << name << "'" << ". It does not exist");

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

@@ -9 +9 @@
 #ifdef PACPUS_USE_LOG
 
-#ifdef _MSC_VER
-#   pragma warning(push)
-#   pragma warning(disable: 4231 4251)
-#endif // _MSC_VER
-
-#include <log4cxx/basicconfigurator.h>
-#include <log4cxx/consoleappender.h>
-#include <log4cxx/patternlayout.h>
-#include <log4cxx/propertyconfigurator.h>
+#include <ostream>
 #include <QString>
 
-#ifdef _MSC_VER
-#   pragma warning(pop)
-#endif // _MSC_VER
+template< typename CharT, typename TraitsT >
+std::basic_ostream< CharT, TraitsT >& operator<< (std::basic_ostream< CharT, TraitsT >& strm, QString const& s)
+{
+    strm << s.toStdString();
+    return strm;
+}
 
-using namespace log4cxx;
+// explicit instantiation
+template
+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)
 
-static int niftyCounter;
+//#include <boost/log/utility/setup/formatter_parser.hpp>
+
+//void init_log_factories()
+//{
+//    //boost::log::register_simple_formatter_factory< QString, char >("QString");
+//}
+
+#endif // PACPUS_USE_LOG
 
 LogConfigurator::LogConfigurator()
 {
-    using namespace log4cxx;
-
-    if (0 == niftyCounter++) {
-        BasicConfigurator::resetConfiguration();
-
-        LayoutPtr lp(new PatternLayout(LOG4CXX_STR("%-6r [%-5p] %30.30c - %m%n")));
-        AppenderPtr ap(new ConsoleAppender(lp));
-        BasicConfigurator::configure(ap);
-        Logger::getRootLogger()->setLevel(log4cxx::Level::getInfo());
-    }
-}
-
-LogConfigurator::~LogConfigurator()
-{
-    if (0 == --niftyCounter) {
-        // clean up
-    }
-}
-
-void LogConfigurator::configureLoggerWithFile(const char * configFilename)
-{
-    BasicConfigurator::resetConfiguration();
-    PropertyConfigurator::configure(configFilename);
-}
-
-} // namespace pacpus
-
-helpers::CharMessageBuffer & operator<<(helpers::CharMessageBuffer & os, const QString & val)
-{
-    return os << val.toStdString();
-}
-
-helpers::CharMessageBuffer & operator<<(helpers::MessageBuffer & os, const QString & val)
-{
-    return os << val.toStdString();
-}
-
-#else // PACPUS_USE_LOG
-
-namespace pacpus {
-
-LogConfigurator::LogConfigurator()
-{
-}
-
-LogConfigurator::~LogConfigurator()
-{
+#if defined(PACPUS_USE_LOG)
+    //init_log_factories();
+#endif // PACPUS_USE_LOG
 }
 
@@ -86 +50 @@
 
 } // namespace pacpus
-
-#endif // PACPUS_USE_LOG

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

@@ -84 +84 @@
         return QApplication::notify(receiver, ev);
     } catch(DbiteException & e) {
+        (void) e; // unused
         LOG_ERROR("DbiteException thrown:" << e.what());
     } catch(std::exception & e) {
+        (void) e; // unused
         LOG_ERROR("std::exception thrown:" << e.what());
     }