diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-08-15 21:14:21 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-08-15 21:14:21 +0100 |
| commit | 9fcaeda0979c8f8ed5ff3ad55e260b14303bc971 (patch) | |
| tree | b57e5f9f6508cf18bd374c9f8fac0d91fa759508 /src/server/shared/Logging/AppenderFile.cpp | |
| parent | 0289f2e1bbe667e059a8249896e35602e8d2ff37 (diff) | |
| parent | 52a5991c1258073d561e8b74ef99a7b940808d92 (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/shared/Logging/Appender.h
src/server/worldserver/worldserver.conf.dist
Diffstat (limited to 'src/server/shared/Logging/AppenderFile.cpp')
| -rw-r--r-- | src/server/shared/Logging/AppenderFile.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/shared/Logging/AppenderFile.cpp b/src/server/shared/Logging/AppenderFile.cpp index 01a2f34baa7..67adff39aae 100644 --- a/src/server/shared/Logging/AppenderFile.cpp +++ b/src/server/shared/Logging/AppenderFile.cpp @@ -24,7 +24,7 @@ AppenderFile::AppenderFile(uint8 id, std::string const& name, LogLevel level, co , logDir(_logDir) , mode(_mode) { - dynamicName = std::string::npos != filename.find("%u"); + dynamicName = std::string::npos != filename.find("%s"); backup = _flags & APPENDER_FLAGS_MAKE_FILE_BACKUP; logfile = !dynamicName ? OpenFile(_filename, _mode, backup) : NULL; @@ -44,7 +44,7 @@ void AppenderFile::_write(LogMessage& message) if (dynamicName) { char namebuf[TRINITY_PATH_MAX]; - snprintf(namebuf, TRINITY_PATH_MAX, filename.c_str(), message.param1); + snprintf(namebuf, TRINITY_PATH_MAX, filename.c_str(), message.param1.c_str()); logfile = OpenFile(namebuf, mode, backup); } |