diff options
author | Jorge <spp@jorge.gr> | 2013-09-13 12:22:31 -0700 |
---|---|---|
committer | Jorge <spp@jorge.gr> | 2013-09-13 12:22:31 -0700 |
commit | f0cd684cd1f944622baac2164aa05e015e6d8060 (patch) | |
tree | 8360042e8d6929c5061bfc0fd955f8df8389b835 /src/server/shared/Logging/AppenderFile.cpp | |
parent | 2e15f78305cd8be65bf43236482d1446d0b0d970 (diff) | |
parent | 1b3575ba772124d2e7a8173a5d35dc9d2d271a8a (diff) |
Merge pull request #10800 from jackpoz/log_race_condition
Core/Logs: Fix race condition in Log
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 93d53bcc30d..54458346bb9 100644 --- a/src/server/shared/Logging/AppenderFile.cpp +++ b/src/server/shared/Logging/AppenderFile.cpp @@ -40,7 +40,7 @@ AppenderFile::~AppenderFile() void AppenderFile::_write(LogMessage const& message) { - bool exceedMaxSize = maxFileSize > 0 && (fileSize + message.Size()) > maxFileSize; + bool exceedMaxSize = maxFileSize > 0 && (fileSize.value() + message.Size()) > maxFileSize; if (dynamicName) { @@ -56,7 +56,7 @@ void AppenderFile::_write(LogMessage const& message) fprintf(logfile, "%s%s", message.prefix.c_str(), message.text.c_str()); fflush(logfile); - fileSize += message.Size(); + fileSize += uint64(message.Size()); if (dynamicName) CloseFile(); |