From db5ad2e09a6b38e841463dbe7eb076492b62c948 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 18 Aug 2009 15:58:17 +0200 Subject: Mad funktioniert jetzt unter Windows --- src/Core/LogManager.h | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'src/Core/LogManager.h') diff --git a/src/Core/LogManager.h b/src/Core/LogManager.h index d3233f0..3aab49e 100644 --- a/src/Core/LogManager.h +++ b/src/Core/LogManager.h @@ -20,6 +20,8 @@ #ifndef MAD_CORE_LOGMANAGER_H_ #define MAD_CORE_LOGMANAGER_H_ +#include "export.h" + #include "Configurable.h" #include "Logger.h" #include "RemoteLogger.h" @@ -36,7 +38,7 @@ namespace Core { class Application; class ThreadManager; -class LogManager : public Configurable { +class MAD_CORE_EXPORT LogManager : public Configurable { private: friend class Application; friend class ThreadManager; @@ -47,14 +49,14 @@ class LogManager : public Configurable { struct Message { MessageCategory category; MessageLevel level; - time_t timestamp; + boost::posix_time::ptime timestamp; std::string message; }; struct RemoteMessage { MessageCategory category; MessageLevel level; - time_t timestamp; + boost::posix_time::ptime timestamp; std::string message; std::string source; }; @@ -62,17 +64,17 @@ class LogManager : public Configurable { class ConsoleLogger : public Logger, public RemoteLogger { private: // For long messages, writing to cerr is not atomic - // -> lock cerr to prevent mixing messages up + // -> lock cerr to prevent messages mixing up boost::mutex cerrLock; protected: - virtual void logMessage(MessageCategory category, MessageLevel level, time_t timestamp, const std::string &message); - virtual void logMessage(MessageCategory category, MessageLevel, time_t timestamp, const std::string &message, const std::string &messageSource); + virtual void logMessage(MessageCategory category, MessageLevel level, boost::posix_time::ptime timestamp, const std::string &message); + virtual void logMessage(MessageCategory category, MessageLevel, boost::posix_time::ptime timestamp, const std::string &message, const std::string &messageSource); public: ConsoleLogger() {} - void logMessageDirect(MessageCategory category, MessageLevel level, time_t timestamp, const std::string &message); + void logMessageDirect(MessageCategory category, MessageLevel level, boost::posix_time::ptime timestamp, const std::string &message); }; @@ -109,8 +111,8 @@ class LogManager : public Configurable { virtual void configFinished(); public: - void log(MessageCategory category, MessageLevel level, time_t timestamp, const std::string &message); - void log(MessageCategory category, MessageLevel level, time_t timestamp, const std::string &message, const std::string &source); + void log(MessageCategory category, MessageLevel level, boost::posix_time::ptime timestamp, const std::string &message); + void log(MessageCategory category, MessageLevel level, boost::posix_time::ptime timestamp, const std::string &message, const std::string &source); void registerLogger(boost::shared_ptr logger) { loggerLock.lock(); -- cgit v1.2.3