[General]: Cleanup logger (#988)

This commit is contained in:
Edo 2023-04-29 10:45:15 +01:00 committed by GitHub
parent de52a67277
commit c1809dbf7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 15 deletions

View File

@ -351,7 +351,7 @@ namespace Components
} }
catch (const std::exception& ex) catch (const std::exception& ex)
{ {
Logger::PrintError(Game::CON_CHANNEL_ERROR, "Json Parse Error: {}\n", ex.what()); Logger::PrintError(Game::CON_CHANNEL_ERROR, "JSON Parse Error: {}\n", ex.what());
return; return;
} }
@ -386,7 +386,7 @@ namespace Components
{ {
if (!Dedicated::IsRunning()) if (!Dedicated::IsRunning())
{ {
Logger::Print(Game::CON_CHANNEL_SERVER, "Server is not running.\n"); Logger::Print("Server is not running.\n");
return; return;
} }
@ -409,7 +409,7 @@ namespace Components
{ {
if (!Dedicated::IsRunning()) if (!Dedicated::IsRunning())
{ {
Logger::Print(Game::CON_CHANNEL_SERVER, "Server is not running.\n"); Logger::Print("Server is not running.\n");
return; return;
} }
@ -450,7 +450,7 @@ namespace Components
{ {
if (!Dedicated::IsRunning()) if (!Dedicated::IsRunning())
{ {
Logger::Print(Game::CON_CHANNEL_SERVER, "Server is not running.\n"); Logger::Print("Server is not running.\n");
return; return;
} }
@ -462,12 +462,12 @@ namespace Components
if (!name.empty()) if (!name.empty())
{ {
Game::SV_GameSendServerCommand(-1, Game::SV_CMD_CAN_IGNORE, Utils::String::Format("{:c} \"{}: {}\"", 0x68, name, message)); Game::SV_GameSendServerCommand(-1, Game::SV_CMD_CAN_IGNORE, Utils::String::Format("{:c} \"{}: {}\"", 0x68, name, message));
Logger::Print(Game::CON_CHANNEL_SERVER, "{}: {}\n", name, message); Logger::Print("{}: {}\n", name, message);
} }
else else
{ {
Game::SV_GameSendServerCommand(-1, Game::SV_CMD_CAN_IGNORE, Utils::String::Format("{:c} \"Console: {}\"", 0x68, message)); Game::SV_GameSendServerCommand(-1, Game::SV_CMD_CAN_IGNORE, Utils::String::Format("{:c} \"Console: {}\"", 0x68, message));
Logger::Print(Game::CON_CHANNEL_SERVER, "Console: {}\n", message); Logger::Print("Console: {}\n", message);
} }
}); });
@ -475,7 +475,7 @@ namespace Components
{ {
if (!Dedicated::IsRunning()) if (!Dedicated::IsRunning())
{ {
Logger::Print(Game::CON_CHANNEL_SERVER, "Server is not running.\n"); Logger::Print("Server is not running.\n");
return; return;
} }
@ -490,12 +490,12 @@ namespace Components
if (!name.empty()) if (!name.empty())
{ {
Game::SV_GameSendServerCommand(clientNum, Game::SV_CMD_CAN_IGNORE, Utils::String::Format("{:c} \"{}: {}\"", 0x68, name.data(), message)); Game::SV_GameSendServerCommand(clientNum, Game::SV_CMD_CAN_IGNORE, Utils::String::Format("{:c} \"{}: {}\"", 0x68, name.data(), message));
Logger::Print(Game::CON_CHANNEL_SERVER, "{} -> {}: {}\n", name, clientNum, message); Logger::Print("{} -> {}: {}\n", name, clientNum, message);
} }
else else
{ {
Game::SV_GameSendServerCommand(clientNum, Game::SV_CMD_CAN_IGNORE, Utils::String::Format("{:c} \"Console: {}\"", 0x68, message)); Game::SV_GameSendServerCommand(clientNum, Game::SV_CMD_CAN_IGNORE, Utils::String::Format("{:c} \"Console: {}\"", 0x68, message));
Logger::Print(Game::CON_CHANNEL_SERVER, "Console -> {}: {}\n", clientNum, message); Logger::Print("Console -> {}: {}\n", clientNum, message);
} }
}); });
@ -503,7 +503,7 @@ namespace Components
{ {
if (!Dedicated::IsRunning()) if (!Dedicated::IsRunning())
{ {
Logger::Print(Game::CON_CHANNEL_SERVER, "Server is not running.\n"); Logger::Print("Server is not running.\n");
return; return;
} }
@ -511,14 +511,14 @@ namespace Components
const auto message = params->join(1); const auto message = params->join(1);
Game::SV_GameSendServerCommand(-1, Game::SV_CMD_CAN_IGNORE, Utils::String::Format("{:c} \"{}\"", 0x68, message)); Game::SV_GameSendServerCommand(-1, Game::SV_CMD_CAN_IGNORE, Utils::String::Format("{:c} \"{}\"", 0x68, message));
Logger::Print(Game::CON_CHANNEL_SERVER, "Raw: {}\n", message); Logger::Print("Raw: {}\n", message);
}); });
Command::AddSV("tellraw", [](Command::Params* params) Command::AddSV("tellraw", [](Command::Params* params)
{ {
if (!Dedicated::IsRunning()) if (!Dedicated::IsRunning())
{ {
Logger::Print(Game::CON_CHANNEL_SERVER, "Server is not running.\n"); Logger::Print("Server is not running.\n");
return; return;
} }
@ -529,7 +529,7 @@ namespace Components
const auto message = params->join(2); const auto message = params->join(2);
Game::SV_GameSendServerCommand(clientNum, Game::SV_CMD_CAN_IGNORE, Utils::String::Format("{:c} \"{}\"", 0x68, message)); Game::SV_GameSendServerCommand(clientNum, Game::SV_CMD_CAN_IGNORE, Utils::String::Format("{:c} \"{}\"", 0x68, message));
Logger::Print(Game::CON_CHANNEL_SERVER, "Raw -> {}: {}\n", clientNum, message); Logger::Print("Raw -> {}: {}\n", clientNum, message);
}); });
sv_sayName = Dvar::Register<const char*>("sv_sayName", "^7Console", Game::DVAR_NONE, "The alias of the server when broadcasting a chat message"); sv_sayName = Dvar::Register<const char*>("sv_sayName", "^7Console", Game::DVAR_NONE, "The alias of the server when broadcasting a chat message");

View File

@ -172,7 +172,7 @@ namespace Components
Network::Address master(Utils::String::VA("%s:%u", masterServerName, masterPort)); Network::Address master(Utils::String::VA("%s:%u", masterServerName, masterPort));
Logger::Print(Game::CON_CHANNEL_SERVER, "Sending heartbeat to master: {}:{}\n", masterServerName, masterPort); Logger::Print("Sending heartbeat to master: {}:{}\n", masterServerName, masterPort);
Network::SendCommand(master, "heartbeat", "IW4"); Network::SendCommand(master, "heartbeat", "IW4");
} }

View File

@ -175,7 +175,7 @@ namespace Components
{ {
if (params->size() < 2) if (params->size() < 2)
{ {
Logger::PrintError(Game::CON_CHANNEL_SERVER, "statget usage: statget <index>\n"); Logger::Print("statget usage: statget <index>\n");
return; return;
} }