nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-15 16:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(Core/Logging): replace most server loggers (#5726)

Browse Source 
* chore(Core/Logging): replace most server loggers

Co-authored-by: Kitzunu <24550914+Kitzunu@users.noreply.github.com>
This commit is contained in:
Kargatum
2021-06-21 08:07:12 +07:00
committed by GitHub
parent 9f80a592bb
commit 5787d00d54
199 changed files with 2312 additions and 4487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/server/worldserver/ACSoap/ACSoap.cpp
View File

@@ -25,20 +25,18 @@ void ACSoapThread(const std::string& host, uint16 port)
if (!soap_valid_socket(soap_bind(&soap, host.c_str(), port, 100)))
{
LOG_ERROR("server", "ACSoap: couldn't bind to %s:%d", host.c_str(), port);
LOG_ERROR("network.soap", "ACSoap: couldn't bind to %s:%d", host.c_str(), port);
exit(-1);
}
LOG_INFO("server", "ACSoap: bound to http://%s:%d", host.c_str(), port);
LOG_INFO("network.soap", "ACSoap: bound to http://%s:%d", host.c_str(), port);
while (!World::IsStopped())
{
if (!soap_valid_socket(soap_accept(&soap)))
continue; // ran into an accept timeout
#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS)
LOG_DEBUG("network", "ACSoap: accepted connection from IP=%d.%d.%d.%d", (int)(soap.ip >> 24) & 0xFF, (int)(soap.ip >> 16) & 0xFF, (int)(soap.ip >> 8) & 0xFF, (int)soap.ip & 0xFF);
#endif
LOG_DEBUG("network.soap", "ACSoap: accepted connection from IP=%d.%d.%d.%d", (int)(soap.ip >> 24) & 0xFF, (int)(soap.ip >> 16) & 0xFF, (int)(soap.ip >> 8) & 0xFF, (int)soap.ip & 0xFF);
struct soap* thread_soap = soap_copy(&soap);// make a safe copy
process_message(thread_soap);
@@ -49,7 +47,7 @@ void ACSoapThread(const std::string& host, uint16 port)
void process_message(struct soap* soap_message)
{
//LOG_TRACE("network.soap", "SOAPWorkingThread::process_message");
LOG_TRACE("network.soap", "SOAPWorkingThread::process_message");
soap_serve(soap_message);
soap_destroy(soap_message); // dealloc C++ data
@@ -67,43 +65,33 @@ int ns1__executeCommand(soap* soap, char* command, char** result)
// security check
if (!soap->userid || !soap->passwd)
{
#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS)
LOG_DEBUG("network", "ACSoap: Client didn't provide login information");
#endif
LOG_DEBUG("network.soap", "ACSoap: Client didn't provide login information");
return 401;
}
uint32 accountId = AccountMgr::GetId(soap->userid);
if (!accountId)
{
#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS)
LOG_DEBUG("network", "ACSoap: Client used invalid username '%s'", soap->userid);
#endif
return 401;
}
if (!AccountMgr::CheckPassword(accountId, soap->passwd))
{
#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS)
LOG_DEBUG("network", "ACSoap: invalid password for account '%s'", soap->userid);
#endif
LOG_DEBUG("network.soap", "ACSoap: invalid password for account '%s'", soap->userid);
return 401;
}
if (AccountMgr::GetSecurity(accountId) < SEC_ADMINISTRATOR)
{
#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS)
LOG_DEBUG("network", "ACSoap: %s's gmlevel is too low", soap->userid);
#endif
LOG_DEBUG("network.soap", "ACSoap: %s's gmlevel is too low", soap->userid);
return 403;
}
if (!command || !*command)
return soap_sender_fault(soap, "Command can not be empty", "The supplied command was an empty string");
#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS)
LOG_DEBUG("network", "ACSoap: got command '%s'", command);
#endif
LOG_DEBUG("network.soap", "ACSoap: got command '%s'", command);
SOAPCommand connection;
// commands are executed in the world thread. We have to wait for them to be completed

24
src/server/worldserver/Master.cpp
View File

@@ -76,7 +76,7 @@ public:
if (!_delayTime)
return;
LOG_INFO("server", "Starting up anti-freeze thread (%u seconds max stuck time)...", _delayTime / 1000);
LOG_INFO("server.worldserver", "Starting up anti-freeze thread (%u seconds max stuck time)...", _delayTime / 1000);
while (!World::IsStopped())
{
uint32 curtime = getMSTime();
@@ -87,13 +87,13 @@ public:
}
else if (getMSTimeDiff(_lastChange, curtime) > _delayTime)
{
LOG_INFO("server", "World Thread hangs, kicking out server!");
LOG_INFO("server.worldserver", "World Thread hangs, kicking out server!");
ABORT();
}
Acore::Thread::Sleep(1000);
}
LOG_INFO("server", "Anti-freeze thread exiting without problems.");
LOG_INFO("server.worldserver", "Anti-freeze thread exiting without problems.");
}
};
@@ -120,10 +120,10 @@ int Master::Run()
if (!pidFile.empty())
{
if (uint32 pid = CreatePIDFile(pidFile))
LOG_ERROR("server", "Daemon PID: %u\n", pid); // outError for red color in console
LOG_ERROR("server.worldserver", "Daemon PID: %u\n", pid); // outError for red color in console
else
{
LOG_ERROR("server", "Cannot create PID file %s (possible error: permission)\n", pidFile.c_str());
LOG_ERROR("server.worldserver", "Cannot create PID file %s (possible error: permission)\n", pidFile.c_str());
return 1;
}
}
@@ -210,7 +210,7 @@ int Master::Run()
std::string bindIp = sConfigMgr->GetOption<std::string>("BindIP", "0.0.0.0");
if (sWorldSocketMgr->StartNetwork(worldPort, bindIp.c_str()) == -1)
{
LOG_ERROR("server", "Failed to start network");
LOG_ERROR("server.worldserver", "Failed to start network");
World::StopNow(ERROR_EXIT_CODE);
// go down and shutdown the server
}
@@ -218,7 +218,7 @@ int Master::Run()
// set server online (allow connecting now)
LoginDatabase.DirectPExecute("UPDATE realmlist SET flag = flag & ~%u, population = 0 WHERE id = '%u'", REALM_FLAG_VERSION_MISMATCH, realm.Id.Realm);
LOG_INFO("server", "%s (worldserver-daemon) ready...", GitRevision::GetFullVersion());
LOG_INFO("server.worldserver", "%s (worldserver-daemon) ready...", GitRevision::GetFullVersion());
// when the main thread closes the singletons get unloaded
// since worldrunnable uses them, it will crash if unloaded after master
@@ -239,7 +239,7 @@ int Master::Run()
_StopDB();
LOG_INFO("server", "Halting process...");
LOG_INFO("server.worldserver", "Halting process...");
if (cliThread)
{
@@ -319,7 +319,7 @@ bool Master::_StartDB()
realm.Id.Realm = sConfigMgr->GetOption<int32>("RealmID", 0);
if (!realm.Id.Realm)
{
LOG_ERROR("server", "Realm ID not defined in configuration file");
LOG_ERROR("server.worldserver", "Realm ID not defined in configuration file");
return false;
}
else if (realm.Id.Realm > 255)
@@ -329,11 +329,11 @@ bool Master::_StartDB()
* with a size of uint8 we can "only" store up to 255 realms
* anything further the client will behave anormaly
*/
LOG_ERROR("server", "Realm ID must range from 1 to 255");
LOG_ERROR("server.worldserver", "Realm ID must range from 1 to 255");
return false;
}
LOG_INFO("server", "Realm running as realm ID %d", realm.Id.Realm);
LOG_INFO("server.worldserver", "Realm running as realm ID %d", realm.Id.Realm);
///- Clean the database before starting
ClearOnlineAccounts();
@@ -344,7 +344,7 @@ bool Master::_StartDB()
sWorld->LoadDBVersion();
sWorld->LoadDBRevision();
LOG_INFO("server", "Using World DB: %s", sWorld->GetDBVersion());
LOG_INFO("server.worldserver", "Using World DB: %s", sWorld->GetDBVersion());
return true;
}

4
src/server/worldserver/WorldThread/WorldRunnable.cpp
View File

@@ -84,7 +84,7 @@ void WorldRunnable::run()
void AuctionListingRunnable::run()
{
LOG_INFO("server", "Starting up Auction House Listing thread...");
LOG_INFO("auctionHouse", "Starting up Auction House Listing thread...");
while (!World::IsStopped())
{
if (AsyncAuctionListingMgr::IsAuctionListingAllowed())
@@ -122,5 +122,5 @@ void AuctionListingRunnable::run()
}
Acore::Thread::Sleep(1);
}
LOG_INFO("server", "Auction House Listing thread exiting without problems.");
LOG_INFO("auctionHouse", "Auction House Listing thread exiting without problems.");
}

36
src/server/worldserver/worldserver.conf.dist
View File

@@ -3482,9 +3482,11 @@ Appender.DBErrors=2,5,0,DBErrors.log
#
Logger.root=2,Console Server
Logger.server=4,Console Server
Logger.commands.gm=4,Console GM
Logger.diff=3,Console Server
Logger.mmaps=4,Server
Logger.scripts.hotswap=4,Console Server
Logger.server=4,Console Server
Logger.sql.sql=2,Console DBErrors
Logger.sql=4,Console Server
Logger.mmaps=4,Server
@@ -3497,29 +3499,37 @@ Logger.mmaps=4,Server
#Logger.bg.battlefield=4,Console Server
#Logger.bg.battleground=4,Console Server
#Logger.bg.reportpvpafk=4,Console Server
#Logger.chat.log=4,Console Server
#Logger.calendar=4,Console Server
#Logger.chat.log=4,Console Server
#Logger.chat.system=4,Console Server
#Logger.cheat=4,Console Server
#Logger.commands.ra=4,Console Server
#Logger.condition=4,Console Server
#Logger.dbc=4,Console Server
#Logger.disable=4,Console Server
#Logger.entities.dyobject=4,Console Server
#Logger.entities.faction=4,Console Server
#Logger.entities.gameobject=4,Console Server
#Logger.entities.object=4,Console Server
#Logger.entities.pet=4,Console Server
#Logger.entities.player=4,Console Server
#Logger.entities.player.character=4,Console Server
#Logger.entities.player.dump=4,Console Server
#Logger.entities.player.items=4,Console Server
#Logger.entities.player.loading=4,Console Server
#Logger.entities.player.skills=4,Console Server
#Logger.entities.player=4,Console Server
#Logger.entities.transport=4,Console Server
#Logger.entities.unit=4,Console Server
#Logger.entities.unit.ai=4,Console Server
#Logger.entities.unit=4,Console Server
#Logger.entities.vehicle=4,Console Server
#Logger.gameevent=4,Console Server
#Logger.group=4,Console Server
#Logger.guild=4,Console Server
#Logger.instance.save=4,Console Server
#Logger.instance.script=4,Console Server
#Logger.lfg=4,Console Server
#Logger.loot=4,Console Server
#Logger.mail=4,Console Server
#Logger.maps.script=4,Console Server
#Logger.maps=4,Console Server
#Logger.misc=4,Console Server
@@ -3527,30 +3537,34 @@ Logger.mmaps=4,Server
#Logger.movement.flightpath=4,Console Server
#Logger.movement.motionmaster=4,Console Server
#Logger.movement.splinechain=4,Console Server
#Logger.network=4,Console Server
#Logger.movement=4,Console Server
#Logger.network.kick=4,Console Server
#Logger.network.opcode=4,Console Server
#Logger.network.soap=4,Console Server
#Logger.network=4,Console Server
#Logger.outdoorpvp=4,Console Server
#Logger.pool=4,Console Server
#Logger.rbac=4,Console Server
#Logger.scripts=4,Console Server
#Logger.scripts.ai=4,Console Server
#Logger.reputation=4,Console Server
#Logger.scripts.ai.escortai=4,Console Server
#Logger.scripts.ai.followerai=4,Console Server
#Logger.scripts.ai.petai=4,Console Server
#Logger.scripts.ai.sai=4,Console Server
#Logger.scripts.ai=4,Console Server
#Logger.scripts.cos=4,Console Server
#Logger.scripts=4,Console Server
#Logger.server.authserver=4,Console Server
#Logger.spells=4,Console Server
#Logger.spells.aura.effect=4,Console Server
#Logger.spells.aura.effect.nospell=4,Console Server
#Logger.spells.effect=4,Console Server
#Logger.spells.aura.effect=4,Console Server
#Logger.spells.effect.nospell=4,Console Server
#Logger.spells.effect=4,Console Server
#Logger.spells.scripts=4,Console Server
#Logger.spells=4,Console Server
#Logger.sql.dev=4,Console Server
#Logger.sql.driver=4,Console Server
#Logger.warden=4,Console Server
#Logger.vehicles=4,Console Server
#Logger.warden=4,Console Server
#Logger.weather=4,Console Server
###################################################################################################
###################################################################################################