Revert "Core/Logging: store loggers in cache correctly"

This reverts commit c6a4d5a1de.
This commit is contained in:
jackpoz
2014-05-18 16:04:59 +02:00
parent a83c315771
commit 0904858624
2 changed files with 11 additions and 7 deletions
+6 -6
View File
@@ -250,13 +250,13 @@ void Log::ReadLoggersFromConfig()
AppenderConsole* appender = new AppenderConsole(NextAppenderId(), "Console", LOG_LEVEL_DEBUG, APPENDER_FLAGS_NONE);
appenders[appender->getId()] = appender;
Logger& rootLogger = loggers[LOGGER_ROOT];
rootLogger.Create(LOGGER_ROOT, LOG_LEVEL_ERROR);
rootLogger.addAppender(appender->getId(), appender);
Logger& logger = loggers[LOGGER_ROOT];
logger.Create(LOGGER_ROOT, LOG_LEVEL_ERROR);
logger.addAppender(appender->getId(), appender);
Logger& serverLogger = loggers["server"];
serverLogger.Create("server", LOG_LEVEL_INFO);
serverLogger.addAppender(appender->getId(), appender);
logger = loggers["server"];
logger.Create("server", LOG_LEVEL_ERROR);
logger.addAppender(appender->getId(), appender);
}
}
+5 -1
View File
@@ -103,12 +103,16 @@ inline Logger const* Log::GetLoggerByType(std::string const& originalType)
}
while (!logger);
cachedLoggers[originalType] = logger;
cachedLoggers[type] = logger;
return logger;
}
inline bool Log::ShouldLog(std::string const& type, LogLevel level)
{
// TODO: Use cache to store "Type.sub1.sub2": "Type" equivalence, should
// Speed up in cases where requesting "Type.sub1.sub2" but only configured
// Logger "Type"
Logger const* logger = GetLoggerByType(type);
if (!logger)
return false;