diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-12-20 17:26:27 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-12-20 17:26:27 +0100 |
| commit | 736093e91b2efee9cb7df37d32fd6705018a6eb5 (patch) | |
| tree | d76ca2cf1b4f5a65bf460ddeadebc7634da264af /src/server/shared/Logging/Log.cpp | |
| parent | 2ded11354de44d6dd7ce6bd222ac188f8fbc3c9c (diff) | |
| parent | 06d42afba09c7048ed42f3e1d923a2a5b6dca93c (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/DungeonFinding/LFGMgr.cpp
src/server/scripts/Kalimdor/zone_silithus.cpp
Diffstat (limited to 'src/server/shared/Logging/Log.cpp')
| -rw-r--r-- | src/server/shared/Logging/Log.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp index bca150b7059..08200af3c19 100644 --- a/src/server/shared/Logging/Log.cpp +++ b/src/server/shared/Logging/Log.cpp @@ -267,7 +267,7 @@ void Log::vlog(std::string const& filter, LogLevel level, char const* str, va_li write(new LogMessage(level, filter, text)); } -void Log::write(LogMessage* msg) const +void Log::write(LogMessage* msg) { Logger const* logger = GetLoggerByType(msg->type); msg->text.append("\n"); @@ -376,6 +376,7 @@ void Log::Close() delete worker; worker = NULL; loggers.clear(); + cachedLoggers.clear(); for (AppenderMap::iterator it = appenders.begin(); it != appenders.end(); ++it) { delete it->second; |