pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-19 20:41:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Code] DatabaseUpdate Global to Singleton Cleanup (#4943)

Browse Source 
Co-authored-by: Chris Miles <akkadius1@gmail.com>
This commit is contained in:
Alex King 2025-06-25 14:48:18 -04:00 committed by GitHub
parent b5f1e99d3b
commit 4f7ff2d6f2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/database/database_update.h
View File

@ -33,6 +33,13 @@ public:
DatabaseUpdate *SetContentDatabase(Database *db); DatabaseUpdate *SetContentDatabase(Database *db);
DatabaseUpdate *SetSkipBackup(bool skip); DatabaseUpdate *SetSkipBackup(bool skip);
bool HasPendingUpdates(); bool HasPendingUpdates();
static DatabaseUpdate* Instance()
{
static DatabaseUpdate instance;
return &instance;
}
private: private:
bool m_skip_backup = false; bool m_skip_backup = false;
Database *m_database; Database *m_database;

3
zone/main.cpp
View File

@ -106,7 +106,6 @@ EQEmuLogSys LogSys;
ZoneEventScheduler event_scheduler; ZoneEventScheduler event_scheduler;
WorldContentService content_service; WorldContentService content_service;
PlayerEventLogs player_event_logs; PlayerEventLogs player_event_logs;
DatabaseUpdate database_update;
EvolvingItemsManager evolving_items_manager; EvolvingItemsManager evolving_items_manager;
const SPDat_Spell_Struct* spells; const SPDat_Spell_Struct* spells;
@ -316,7 +315,7 @@ int main(int argc, char **argv)
const auto c = EQEmuConfig::get(); const auto c = EQEmuConfig::get();
if (c->auto_database_updates) { if (c->auto_database_updates) {
if (database_update.SetDatabase(&database)->HasPendingUpdates()) { if (DatabaseUpdate::Instance()->SetDatabase(&database)->HasPendingUpdates()) {
LogWarning("Database is not up to date [world] needs to be ran to apply updates, shutting down in 5 seconds"); LogWarning("Database is not up to date [world] needs to be ran to apply updates, shutting down in 5 seconds");
std::this_thread::sleep_for(std::chrono::milliseconds(5000)); std::this_thread::sleep_for(std::chrono::milliseconds(5000));
LogInfo("Exiting due to pending database updates"); LogInfo("Exiting due to pending database updates");