Changeset 122 for XMLIO_V2/dev/dev_rv/src/XMLIO/logger.hpp

Timestamp:

09/20/10 17:30:34 (14 years ago)

Author:

hozdoba

Message:

Plusieurs modifications en attendant une version propre et stable.

File:

• XMLIO_V2/dev/dev_rv/src/XMLIO/logger.hpp (modified) (4 diffs)

XMLIO_V2/dev/dev_rv/src/XMLIO/logger.hpp

@@ -3 +3 @@
 
 // Entête Poco logging
-#include <Poco/Logger.h>
-#include <Poco/PatternFormatter.h>
-#include <Poco/FormattingChannel.h>
-#include <Poco/ConsoleChannel.h>
-#include <Poco/FileChannel.h>
-#include <Poco/Message.h>
-
-#include <Poco/AutoPtr.h>
-
 #include <csignal>
 
@@ -19 +10 @@
 #endif // __GNUC__
 
-// Classes utilisées issues de Poco
-using Poco::Logger;
-using Poco::PatternFormatter;
-using Poco::FormattingChannel;
-using Poco::ConsoleChannel;
-using Poco::FileChannel;
-using Poco::Message;
-
-using Poco::AutoPtr;
+using std::string;
 
 namespace XMLIOSERVER
 {
-   class ILogger
+   class ILogger : public std::ostringstream
    {
+      private :
+
+         ILogger()
+         { signal(SIGSEGV, SigHandler); }
+
+         static ILogger LOGGER;
+
       public :
 
-         ILogger()
-         {
-            // TODO Créer une sortie fichier.
-            AutoPtr<PatternFormatter> pf = new PatternFormatter("[%Y-%m-%d %H:%M:%S] %t");
-            AutoPtr<ConsoleChannel> cc = new ConsoleChannel();
-            AutoPtr<FormattingChannel> pFCConsole = new FormattingChannel(pf);
-            pFCConsole->setChannel(cc);
-            pFCConsole->open();
-            Logger::create("ConsoleLogger", pFCConsole, Message::PRIO_INFORMATION);
-
-            signal(SIGSEGV, SigHandler);
-         }
+         static ILogger& GetLogger(void) { return (ILogger::LOGGER); }
 
          static void ShowBTrace(std::ostream& out = std::clog)
@@ -84 +63 @@
          }
 
-
-         static Logger & GetConsoleLogger(void) {return (Logger::get("ConsoleLogger"));}
-
          ~ILogger(void)
-         { /* Ne rien faire de plus */ }
+         { std::cout << str() << std::endl; }
 
    }; // class XMLIOLogger
 
    // Initialisation de la classe de Logging
-   ILogger LOGGER;
+   ILogger ILogger::LOGGER;
 
    /////////////////////////////////////////////////////////////////////
@@ -113 +89 @@
 } // namespace XMLIOSERVER
 
-#define   ERROR(MSG)   (XMLIOSERVER::ILogger::GetConsoleLogger().error(MSG))
-#define   WARNING(MSG) (XMLIOSERVER::ILogger::GetConsoleLogger().warning(MSG))
-#define   INFO(MSG)    (XMLIOSERVER::ILogger::GetConsoleLogger().information(MSG))
+#define   ERROR(MSG)   (ILogger::GetLogger() << __FILE__ << ":" << __LINE__ << ": error : "   << MSG << std::endl)
+#define   WARNING(MSG) (ILogger::GetLogger() << __FILE__ << ":" << __LINE__ << ": warning : " << MSG << std::endl)
+#define   INFO(MSG)    (ILogger::GetLogger() << __FILE__ << ":" << __LINE__ << ": info : "    << MSG << std::endl)
 // A compléter.