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

[Code] DatabaseUpdate Global to Singleton Cleanup

Browse Source
This commit is contained in:
Kinglykrab
2025-06-20 22:55:57 -04:00
parent 1be7e56b86
commit 511829351c
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/database/database_update.h
+7
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;
zone/main.cpp
+1 -2
View File
@@ -109,7 +109,6 @@ ZoneEventScheduler event_scheduler;
WorldContentService content_service; WorldContentService content_service;
PathManager path; PathManager path;
PlayerEventLogs player_event_logs; PlayerEventLogs player_event_logs;
DatabaseUpdate database_update;
SkillCaps skill_caps; SkillCaps skill_caps;
EvolvingItemsManager evolving_items_manager; EvolvingItemsManager evolving_items_manager;
@@ -320,7 +319,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");