pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 18:52:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Migrate shared memory to use content database source; add logic in DB::core to prevent double freeing [skip ci]

Browse Source
This commit is contained in:
Akkadius
2020-03-12 01:23:06 -05:00
parent 49d835165c
commit 7ee28d6361
3 changed files with 47 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared_memory/main.cpp
+25 -6
View File
@@ -87,6 +87,7 @@ int main(int argc, char **argv)
auto Config = EQEmuConfig::get();
SharedDatabase database;
SharedDatabase content_db;
LogInfo("Connecting to database");
if (!database.Connect(
Config->DatabaseHost.c_str(),
@@ -99,6 +100,24 @@ int main(int argc, char **argv)
return 1;
}
/**
* Multi-tenancy: Content database
*/
if (!Config->ContentDbHost.empty()) {
if (!content_db.Connect(
Config->ContentDbHost.c_str() ,
Config->ContentDbUsername.c_str(),
Config->ContentDbPassword.c_str(),
Config->ContentDbName.c_str(),
Config->ContentDbPort
)) {
LogError("Cannot continue without a content database connection");
return 1;
}
} else {
content_db.SetMysql(database.getMySQL());
}
/* Register Log System and Settings */
database.LoadLogSettings(LogSys.log_settings);
LogSys.StartFileLogs();
@@ -194,7 +213,7 @@ int main(int argc, char **argv)
if (load_all || load_items) {
LogInfo("Loading items");
try {
LoadItems(&database, hotfix_name);
LoadItems(&content_db, hotfix_name);
} catch (std::exception &ex) {
LogError("{}", ex.what());
return 1;
@@ -204,7 +223,7 @@ int main(int argc, char **argv)
if (load_all || load_factions) {
LogInfo("Loading factions");
try {
LoadFactions(&database, hotfix_name);
LoadFactions(&content_db, hotfix_name);
} catch (std::exception &ex) {
LogError("{}", ex.what());
return 1;
@@ -214,7 +233,7 @@ int main(int argc, char **argv)
if (load_all || load_loot) {
LogInfo("Loading loot");
try {
LoadLoot(&database, hotfix_name);
LoadLoot(&content_db, hotfix_name);
} catch (std::exception &ex) {
LogError("{}", ex.what());
return 1;
@@ -224,7 +243,7 @@ int main(int argc, char **argv)
if (load_all || load_skill_caps) {
LogInfo("Loading skill caps");
try {
LoadSkillCaps(&database, hotfix_name);
LoadSkillCaps(&content_db, hotfix_name);
} catch (std::exception &ex) {
LogError("{}", ex.what());
return 1;
@@ -234,7 +253,7 @@ int main(int argc, char **argv)
if (load_all || load_spells) {
LogInfo("Loading spells");
try {
LoadSpells(&database, hotfix_name);
LoadSpells(&content_db, hotfix_name);
} catch (std::exception &ex) {
LogError("{}", ex.what());
return 1;
@@ -244,7 +263,7 @@ int main(int argc, char **argv)
if (load_all || load_bd) {
LogInfo("Loading base data");
try {
LoadBaseData(&database, hotfix_name);
LoadBaseData(&content_db, hotfix_name);
} catch (std::exception &ex) {
LogError("{}", ex.what());
return 1;