diff options
| author | Spp <spp@jorge.gr> | 2013-01-16 15:29:41 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2013-01-16 15:29:41 +0100 |
| commit | 0e8011657d08c4a9f12657ccbe2f73aa56effaaa (patch) | |
| tree | 23a6f5d51b4febcd7be8acd0b49eed173640bcf2 /src/server/shared/Logging/AppenderFile.cpp | |
| parent | 9391d087fd1707ae9298e0f6ced54bf3d7f11c13 (diff) | |
| parent | 927062f61fb0c61da0e31f38e9be249f81c89d6c (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSocket.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
Diffstat (limited to 'src/server/shared/Logging/AppenderFile.cpp')
| -rw-r--r-- | src/server/shared/Logging/AppenderFile.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/shared/Logging/AppenderFile.cpp b/src/server/shared/Logging/AppenderFile.cpp index 7b0bac03d03..8189237bb4e 100644 --- a/src/server/shared/Logging/AppenderFile.cpp +++ b/src/server/shared/Logging/AppenderFile.cpp @@ -39,7 +39,7 @@ AppenderFile::~AppenderFile() } } -void AppenderFile::_write(LogMessage& message) +void AppenderFile::_write(LogMessage const& message) { if (dynamicName) { @@ -70,5 +70,6 @@ FILE* AppenderFile::OpenFile(std::string const &filename, std::string const &mod newName.append(LogMessage::getTimeStr(time(NULL))); rename(filename.c_str(), newName.c_str()); // no error handling... if we couldn't make a backup, just ignore } + return fopen((logDir + filename).c_str(), mode.c_str()); } |