pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-17 03:08:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Code] PlayerEventLogs Global to Singleton Cleanup (#4928)

Browse Source 
* [Code] PlayerEventLogs Global to Singleton Cleanup

* Fix

---------

Co-authored-by: Chris Miles <akkadius1@gmail.com>
This commit is contained in:
Alex King
2025-06-25 16:05:33 -04:00
committed by GitHub
parent c0bb32ed12
commit 643ee56433
41 changed files with 95 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/database.cpp
+1 -1
View File
@@ -2244,7 +2244,7 @@ void Database::PurgeCharacterParcels()
pel.event_data = ss.str();
pel.created_at = std::time(nullptr);
player_event_logs.AddToQueue(pel);
PlayerEventLogs::Instance()->AddToQueue(pel);
ss.str("");
ss.clear();
common/discord/discord_manager.cpp
+1 -1
View File
@@ -68,7 +68,7 @@ void DiscordManager::ProcessMessageQueue()
void DiscordManager::QueuePlayerEventMessage(const PlayerEvent::PlayerEventContainer& e)
{
auto w = player_event_logs.GetDiscordWebhookUrlFromEventType(e.player_event_log.event_type_id);
auto w = PlayerEventLogs::Instance()->GetDiscordWebhookUrlFromEventType(e.player_event_log.event_type_id);
if (!w.empty()) {
Discord::SendPlayerEventMessage(e, w);
}
common/events/player_event_logs.h
+6 -2
View File
@@ -96,6 +96,12 @@ public:
std::vector<PlayerEventAaPurchaseRepository::PlayerEventAaPurchase> aa_purchase;
};
static PlayerEventLogs* Instance()
{
static PlayerEventLogs instance;
return &instance;
}
private:
struct EtlSettings {
bool enabled;
@@ -129,6 +135,4 @@ public:
std::map<PlayerEvent::EventType, EtlSettings> &GetEtlSettings() { return m_etl_settings;}
};
extern PlayerEventLogs player_event_logs;
#endif //EQEMU_PLAYER_EVENT_LOGS_H
common/events/player_events.h
+6 -6
View File
@@ -1756,10 +1756,10 @@ namespace PlayerEvent {
#endif //EQEMU_PLAYER_EVENTS_H
#define RecordPlayerEventLog(event_type, event_data) do {\
if (player_event_logs.IsEventEnabled(event_type)) {\
if (PlayerEventLogs::Instance()->IsEventEnabled(event_type)) {\
if (RuleB(Logging, PlayerEventsQSProcess)) {\
QServ->SendPacket(\
player_event_logs.RecordEvent(\
PlayerEventLogs::Instance()->RecordEvent(\
event_type,\
GetPlayerEvent(),\
event_data\
@@ -1768,7 +1768,7 @@ namespace PlayerEvent {
} \
else { \
worldserver.SendPacket(\
player_event_logs.RecordEvent(\
PlayerEventLogs::Instance()->RecordEvent(\
event_type,\
GetPlayerEvent(),\
event_data\
@@ -1779,10 +1779,10 @@ namespace PlayerEvent {
} while (0)
#define RecordPlayerEventLogWithClient(c, event_type, event_data) do {\
if (player_event_logs.IsEventEnabled(event_type)) {\
if (PlayerEventLogs::Instance()->IsEventEnabled(event_type)) {\
if (RuleB(Logging, PlayerEventsQSProcess)) {\
QServ->SendPacket(\
player_event_logs.RecordEvent(\
PlayerEventLogs::Instance()->RecordEvent(\
event_type,\
(c)->GetPlayerEvent(),\
event_data\
@@ -1791,7 +1791,7 @@ namespace PlayerEvent {
}\
else {\
worldserver.SendPacket(\
player_event_logs.RecordEvent(\
PlayerEventLogs::Instance()->RecordEvent(\
event_type,\
(c)->GetPlayerEvent(),\
event_data\