aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaios <naios-dev@live.de>2015-04-24 19:44:16 +0200
committerNaios <naios-dev@live.de>2015-04-24 19:47:22 +0200
commit26f9b3b98877012abbb06defc02d97e7d529cbd6 (patch)
tree75f4f3345ea60aba922f8907de14ae00e6913c98
parentc8cf05338fb0bdc32a4a2fce9e891c4a6a3d5b6b (diff)
Core/Log: Fix newlines when using dynamic log names
* thanks @Aokromes for reporting * also removes an unnecessary std::move (cherry picked from commit 2592528741a3ce4879c9d5f398e12b37a975cbcf)
-rw-r--r--src/server/shared/Logging/Appender.cpp2
-rw-r--r--src/server/shared/Logging/AppenderFile.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/shared/Logging/Appender.cpp b/src/server/shared/Logging/Appender.cpp
index ba23d879ec2..31db3ae1b86 100644
--- a/src/server/shared/Logging/Appender.cpp
+++ b/src/server/shared/Logging/Appender.cpp
@@ -88,7 +88,7 @@ void Appender::write(LogMessage* message)
if (flags & APPENDER_FLAGS_PREFIX_LOGFILTERTYPE)
ss << '[' << message->type << "] ";
- message->prefix = std::move(ss.str());
+ message->prefix = ss.str();
_write(message);
}
diff --git a/src/server/shared/Logging/AppenderFile.cpp b/src/server/shared/Logging/AppenderFile.cpp
index 3892adbe3be..5a8d610a36b 100644
--- a/src/server/shared/Logging/AppenderFile.cpp
+++ b/src/server/shared/Logging/AppenderFile.cpp
@@ -55,7 +55,7 @@ void AppenderFile::_write(LogMessage const* message)
FILE* file = OpenFile(namebuf, "a", backup || exceedMaxSize);
if (!file)
return;
- fprintf(file, "%s%s", message->prefix.c_str(), message->text.c_str());
+ fprintf(file, "%s%s\n", message->prefix.c_str(), message->text.c_str());
fflush(file);
fileSize += uint64(message->Size());
fclose(file);