diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-08-16 20:17:29 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-08-16 20:17:29 +0100 |
| commit | 21fb427ffc41858edd8edc21280609ddca0d6b22 (patch) | |
| tree | fdfba24744142eed9c04d341168a1fb584799fb3 /src/server/shared/Logging/Log.cpp | |
| parent | 759e73c78f138094a28068286d2f44c9e1162bb6 (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Events/GameEventMgr.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Spells/SpellMgr.cpp
src/server/worldserver/worldserver.conf.dist
Diffstat (limited to 'src/server/shared/Logging/Log.cpp')
| -rw-r--r-- | src/server/shared/Logging/Log.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp index 8e740ba83b8..3a24190d8fa 100644 --- a/src/server/shared/Logging/Log.cpp +++ b/src/server/shared/Logging/Log.cpp @@ -114,9 +114,6 @@ void Log::CreateAppenderFromConfig(const char* name) { case APPENDER_CONSOLE: { - if (flags == APPENDER_FLAGS_NONE) - flags = AppenderFlags(APPENDER_FLAGS_PREFIX_LOGLEVEL | APPENDER_FLAGS_PREFIX_LOGFILTERTYPE); - AppenderConsole* appender = new AppenderConsole(NextAppenderId(), name, level, flags); appenders[appender->getId()] = appender; if (++iter != tokens.end()) @@ -135,9 +132,6 @@ void Log::CreateAppenderFromConfig(const char* name) return; } - if (flags == APPENDER_FLAGS_NONE) - flags = AppenderFlags(APPENDER_FLAGS_PREFIX_LOGLEVEL | APPENDER_FLAGS_PREFIX_LOGFILTERTYPE | APPENDER_FLAGS_PREFIX_TIMESTAMP); - filename = *iter; if (++iter != tokens.end()) |