diff options
Diffstat (limited to 'src/Core/LogManager.cpp')
-rw-r--r-- | src/Core/LogManager.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/Core/LogManager.cpp b/src/Core/LogManager.cpp index d5928f9..b255c04 100644 --- a/src/Core/LogManager.cpp +++ b/src/Core/LogManager.cpp @@ -27,21 +27,21 @@ namespace Mad { namespace Core { -void LogManager::ConsoleLogger::logMessage(MessageCategory /*category*/, MessageLevel level, time_t /*timestamp*/, const std::string &message) { - if(level != CRITICAL) {// Critical messages are printed to cerr directly, so don't print them a second time +void LogManager::ConsoleLogger::logMessage(MessageCategory /*category*/, MessageLevel level, boost::posix_time::ptime /*timestamp*/, const std::string &message) { + if(level != LOG_CRITICAL) {// Critical messages are printed to cerr directly, so don't print them a second time cerrLock.lock(); std::cerr << message << std::endl; cerrLock.unlock(); } } -void LogManager::ConsoleLogger::logMessage(MessageCategory /*category*/, MessageLevel /*level*/, time_t /*timestamp*/, const std::string &message, const std::string &messageSource) { +void LogManager::ConsoleLogger::logMessage(MessageCategory /*category*/, MessageLevel /*level*/, boost::posix_time::ptime /*timestamp*/, const std::string &message, const std::string &messageSource) { cerrLock.lock(); std::cerr << message << " from " << messageSource << std::endl; cerrLock.unlock(); } -void LogManager::ConsoleLogger::logMessageDirect(MessageCategory /*category*/, MessageLevel /*level*/, time_t /*timestamp*/, const std::string &message) { +void LogManager::ConsoleLogger::logMessageDirect(MessageCategory /*category*/, MessageLevel /*level*/, boost::posix_time::ptime /*timestamp*/, const std::string &message) { cerrLock.lock(); std::cerr << message << std::endl; cerrLock.unlock(); @@ -69,7 +69,7 @@ bool LogManager::handleConfigEntry(const ConfigEntry &entry, bool handled) { } } else if(entry[1].empty()) { - application->logf(Logger::WARNING, "Unknown logger '%s'.", entry[0][0].c_str()); + application->logf(Logger::LOG_WARNING, "Unknown logger '%s'.", entry[0][0].c_str()); return true; } } @@ -82,7 +82,7 @@ void LogManager::configFinished() { registerLogger(boost::static_pointer_cast<Logger>(consoleLogger)); // TODO Debug - consoleLogger->Logger::setLevel(LoggerBase::VERBOSE); + consoleLogger->Logger::setLevel(LoggerBase::LOG_VERBOSE); queueLock.lock(); configured = true; @@ -90,8 +90,8 @@ void LogManager::configFinished() { queueCond.notify_one(); } -void LogManager::log(MessageCategory category, MessageLevel level, time_t timestamp, const std::string &message) { - if(level == LoggerBase::CRITICAL) +void LogManager::log(MessageCategory category, MessageLevel level, boost::posix_time::ptime timestamp, const std::string &message) { + if(level == LoggerBase::LOG_CRITICAL) consoleLogger->logMessageDirect(category, level, timestamp, message); queueLock.lock(); @@ -101,7 +101,7 @@ void LogManager::log(MessageCategory category, MessageLevel level, time_t timest queueCond.notify_one(); } -void LogManager::log(MessageCategory category, MessageLevel level, time_t timestamp, const std::string &message, const std::string &source) { +void LogManager::log(MessageCategory category, MessageLevel level, boost::posix_time::ptime timestamp, const std::string &message, const std::string &source) { queueLock.lock(); RemoteMessage m = {category, level, timestamp, message, source}; remoteMessageQueue.push(m); |