Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into 6.x

Conflicts:
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Server/Protocol/Opcodes.cpp

1 files changed, 3 insertions, 16 deletions

diff --git a/src/server/shared/Logging/Appender.cpp b/src/server/shared/Logging/Appender.cpp
index ca40a857419..ba23d879ec2 100644
--- a/src/server/shared/Logging/Appender.cpp
+++ b/src/server/shared/Logging/Appender.cpp
@@ -80,26 +80,13 @@ void Appender::write(LogMessage* message)
     std::ostringstream ss;
 
     if (flags & APPENDER_FLAGS_PREFIX_TIMESTAMP)
-        ss << message->getTimeStr();
+        ss << message->getTimeStr() << ' ';
 
     if (flags & APPENDER_FLAGS_PREFIX_LOGLEVEL)
-    {
-        if (ss.rdbuf()->in_avail() == 0)
-            ss << ' ';
-
-        ss << Trinity::StringFormat("%-5s", Appender::getLogLevelString(message->level));
-    }
+        ss << Trinity::StringFormat("%-5s ", Appender::getLogLevelString(message->level));
 
     if (flags & APPENDER_FLAGS_PREFIX_LOGFILTERTYPE)
-    {
-        if (ss.rdbuf()->in_avail() == 0)
-            ss << ' ';
-
-        ss << '[' << message->type << ']';
-    }
-
-    if (ss.rdbuf()->in_avail() == 0)
-        ss << ' ';
+        ss << '[' << message->type << "] ";
 
     message->prefix = std::move(ss.str());
     _write(message);