mirror of
https://github.com/EQEmu/Server.git
synced 2026-08-23 19:17:54 +00:00
[Code] EQEmuLogSys Global to Singleton Cleanup (#4925)
* [Code] EQEmuLogSys Global to Singleton Cleanup * Post merge fix
This commit is contained in:
@@ -29,7 +29,6 @@ LFGuildManager lfguildmanager;
|
||||
std::string WorldShortName;
|
||||
const queryservconfig *Config;
|
||||
WorldServer *worldserver = 0;
|
||||
EQEmuLogSys LogSys;
|
||||
PlayerEventLogs player_event_logs;
|
||||
ZSList zs_list;
|
||||
uint32 numzones = 0;
|
||||
@@ -42,7 +41,7 @@ void CatchSignal(int sig_num)
|
||||
int main()
|
||||
{
|
||||
RegisterExecutablePlatform(ExePlatformQueryServ);
|
||||
LogSys.LoadLogSettingsDefaults();
|
||||
EQEmuLogSys::Instance()->LoadLogSettingsDefaults();
|
||||
set_exception_handler();
|
||||
Timer LFGuildExpireTimer(60000);
|
||||
|
||||
@@ -81,7 +80,7 @@ int main()
|
||||
return 1;
|
||||
}
|
||||
|
||||
LogSys.SetDatabase(&database)
|
||||
EQEmuLogSys::Instance()->SetDatabase(&database)
|
||||
->SetLogPath(PathManager::Instance()->GetLogPath())
|
||||
->LoadLogDatabaseSettings()
|
||||
->StartFileLogs();
|
||||
@@ -183,7 +182,7 @@ int main()
|
||||
EQ::EventLoop::Get().Run();
|
||||
|
||||
safe_delete(worldserver);
|
||||
LogSys.CloseFileLogs();
|
||||
EQEmuLogSys::Instance()->CloseFileLogs();
|
||||
}
|
||||
|
||||
void UpdateWindowTitle(char *iNewTitle)
|
||||
|
||||
@@ -79,7 +79,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
|
||||
case ServerOP_ServerReloadRequest: {
|
||||
auto o = (ServerReload::Request*) p.Data();
|
||||
if (o->type == ServerReload::Type::Logs) {
|
||||
LogSys.LoadLogDatabaseSettings();
|
||||
EQEmuLogSys::Instance()->LoadLogDatabaseSettings();
|
||||
player_event_logs.ReloadSettings();
|
||||
zs_list.SendPlayerEventLogSettings();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user