pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-25 10:28:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Code] PlayerEventLogs Global to Singleton Cleanup

Browse Source
This commit is contained in:
Kinglykrab
2025-06-20 21:22:14 -04:00
committed by Chris Miles
parent c0bb32ed12
commit 7debd578a9
40 changed files with 92 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
world/cli/etl_get_settings.cpp
+3 -3
View File
@@ -12,9 +12,9 @@ void WorldserverCLI::EtlGetSettings(int argc, char **argv, argh::parser &cmd, st
Json::Value etl_settings;
Json::Value player_events;
player_event_logs.SetDatabase(&database)->Init();
auto event_settings = player_event_logs.GetSettings();
auto etl_details = player_event_logs.GetEtlSettings();
PlayerEventLogs::Instance()->SetDatabase(&database)->Init();
auto event_settings = PlayerEventLogs::Instance()->GetSettings();
auto etl_details = PlayerEventLogs::Instance()->GetEtlSettings();
for (int i = PlayerEvent::GM_COMMAND; i < PlayerEvent::EventType::MAX; i++) {
player_events["event_id"] = event_settings[i].id;
world/client.cpp
+1 -1
View File
@@ -2430,7 +2430,7 @@ bool Client::StoreCharacter(
void Client::RecordPossibleHack(const std::string& message)
{
if (player_event_logs.IsEventEnabled(PlayerEvent::POSSIBLE_HACK)) {
if (PlayerEventLogs::Instance()->IsEventEnabled(PlayerEvent::POSSIBLE_HACK)) {
auto event = PlayerEvent::PossibleHackEvent{.message = message};
std::stringstream ss;
{
world/main.cpp
+3 -4
View File
@@ -99,7 +99,6 @@ volatile bool RunLoops = true;
uint32 numclients = 0;
uint32 numzones = 0;
const WorldConfig *Config;
PlayerEventLogs player_event_logs;
void CatchSignal(int sig_num);
@@ -368,8 +367,8 @@ int main(int argc, char **argv)
}
);
if (player_event_logs.LoadDatabaseConnection()) {
player_event_logs.Init();
if (PlayerEventLogs::Instance()->LoadDatabaseConnection()) {
PlayerEventLogs::Instance()->Init();
}
auto loop_fn = [&](EQ::Timer* t) {
@@ -467,7 +466,7 @@ int main(int argc, char **argv)
if (!RuleB(Logging, PlayerEventsQSProcess)) {
if (player_event_log_process.Check()) {
player_event_logs.Process();
PlayerEventLogs::Instance()->Process();
}
}
world/zonelist.cpp
+1 -1
View File
@@ -981,7 +981,7 @@ void ZSList::SendServerReload(ServerReload::Type type, uchar *packet)
WorldContentService::Instance()->SetExpansionContext()->ReloadContentFlags();
} else if (type == ServerReload::Type::Logs) {
EQEmuLogSys::Instance()->LoadLogDatabaseSettings();
player_event_logs.ReloadSettings();
PlayerEventLogs::Instance()->ReloadSettings();
UCSConnection::Instance()->SendPacket(&pack);
QueryServConnection::Instance()->SendPacket(&pack);
} else if (type == ServerReload::Type::Tasks) {
world/zoneserver.cpp
+2 -2
View File
@@ -368,14 +368,14 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
// if set, process events in queryserver
// if you want to offload event recording to a dedicated QS instance
if (!RuleB(Logging, PlayerEventsQSProcess)) {
player_event_logs.AddToQueue(n.player_event_log);
PlayerEventLogs::Instance()->AddToQueue(n.player_event_log);
}
else {
QueryServConnection::Instance()->SendPacket(pack);
}
// if discord enabled for event, ship to UCS to process
if (player_event_logs.IsEventDiscordEnabled(n.player_event_log.event_type_id)) {
if (PlayerEventLogs::Instance()->IsEventDiscordEnabled(n.player_event_log.event_type_id)) {
UCSConnection::Instance()->SendPacket(pack);
}