ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(Core/Misc): add braces and impove codestyle (#6402)

Browse source
This commit is contained in:
Kargatum 2021-06-25 00:50:18 +07:00 • committed by GitHub
parent 33c271cc7c
commit 3c24b511f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
72 changed files with 1486 additions and 401 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/common/Logging/AppenderConsole.cpp
View file

@ -20,10 +20,14 @@ AppenderConsole::AppenderConsole(uint8 id, std::string const& name, LogLevel lev
: Appender(id, name, level, flags), _colored(false)
{
for (uint8 i = 0; i < NUM_ENABLED_LOG_LEVELS; ++i)
{
_colors[i] = ColorTypes(NUM_COLOR_TYPES);
}
if (3 < args.size())
{
InitColors(name, args[3]);
}
}
void AppenderConsole::InitColors(std::string const& name, std::string_view str)
@ -44,7 +48,9 @@ void AppenderConsole::InitColors(std::string const& name, std::string_view str)
for (uint8 i = 0; i < NUM_ENABLED_LOG_LEVELS; ++i)
{
if (Optional<uint8> color = Acore::StringTo<uint8>(colorStrs[i]); color && EnumUtils::IsValid<ColorTypes>(*color))
{
_colors[i] = static_cast<ColorTypes>(*color);
}
else
{
throw InvalidAppenderArgsException(Acore::StringFormat("Log::CreateAppenderFromConfig: Invalid color '%s' for log level %s on console appender %s",
@ -138,8 +144,8 @@ void AppenderConsole::SetColor(bool stdout_stream, ColorTypes color)
FG_WHITE // LWHITE
};
fprintf((stdout_stream? stdout : stderr), "\x1b[%d%sm", UnixColorFG[color], (color >= YELLOW && color < NUM_COLOR_TYPES ? ";1" : ""));
#endif
fprintf((stdout_stream ? stdout : stderr), "\x1b[%d%sm", UnixColorFG[color], (color >= YELLOW && color < NUM_COLOR_TYPES ? ";1" : ""));
#endif
}
void AppenderConsole::ResetColor(bool stdout_stream)
@ -163,23 +169,23 @@ void AppenderConsole::_write(LogMessage const* message)
switch (message->level)
{
case LOG_LEVEL_TRACE:
index = 5;
break;
index = 5;
break;
case LOG_LEVEL_DEBUG:
index = 4;
break;
index = 4;
break;
case LOG_LEVEL_INFO:
index = 3;
break;
index = 3;
break;
case LOG_LEVEL_WARN:
index = 2;
break;
index = 2;
break;
case LOG_LEVEL_FATAL:
index = 0;
break;
index = 0;
break;
default:
index = 1;
break;
index = 1;
break;
}
SetColor(stdout_stream, _colors[index]);
@ -187,5 +193,7 @@ void AppenderConsole::_write(LogMessage const* message)
ResetColor(stdout_stream);
}
else
{
utf8printf(stdout_stream ? stdout : stderr, "%s%s\n", message->prefix.c_str(), message->text.c_str());
}
}