Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Log: Improve creation of log prefixes.

Browse Source 
* this also fixes non whitespace seperated timestamps in logs after 95ebe4f31c @Aokromes
* remove an unnecessary stringstream in Log::outCommand
* delete copy constructor of LogMessage to prevent unwanted copies
This commit is contained in:
Naios
2015-03-28 17:11:30 +01:00
parent 9b0b1185e4
commit a2e280c8a8
3 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/server/shared/Logging/Appender.cpp
View File

@@ -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);

3
src/server/shared/Logging/Appender.h
View File

@@ -62,6 +62,9 @@ struct LogMessage
: level(_level), type(_type), text(std::forward<std::string>(_text)), mtime(time(NULL))
{ }
LogMessage(LogMessage const& /*other*/) = delete;
LogMessage& operator=(LogMessage const& /*other*/) = delete;
static std::string getTimeStr(time_t time);
std::string getTimeStr();

4
src/server/shared/Logging/Log.h
View File

@@ -75,9 +75,7 @@ class Log
std::unique_ptr<LogMessage> msg(new LogMessage(LOG_LEVEL_INFO, "commands.gm", std::move(Trinity::StringFormat(fmt, args...))));
std::ostringstream ss;
ss << account;
msg->param1 = ss.str();
msg->param1 = std::to_string(account);
write(std::move(msg));
}