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

Simplify connection logic

Browse Source
This commit is contained in:
Akkadius 2020-03-11 04:23:44 -05:00
parent 6af1ae32ae
commit 26b24c02f1
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
world/main.cpp
View File

@ -143,11 +143,11 @@ void LoadDatabaseConnections()
*/ */
if (!Config->ContentDbHost.empty()) { if (!Config->ContentDbHost.empty()) {
if (!content_db.Connect( if (!content_db.Connect(
!Config->ContentDbHost.empty() ? Config->ContentDbHost.c_str() : Config->DatabaseHost.c_str(), Config->ContentDbHost.c_str() ,
!Config->ContentDbUsername.empty() ? Config->ContentDbUsername.c_str() : Config->DatabaseUsername.c_str(), Config->ContentDbUsername.c_str(),
!Config->ContentDbPassword.empty() ? Config->ContentDbPassword.c_str() : Config->DatabasePassword.c_str(), Config->ContentDbPassword.c_str(),
!Config->ContentDbName.empty() ? Config->ContentDbName.c_str() : Config->DatabaseDB.c_str(), Config->ContentDbName.c_str(),
Config->ContentDbPort != 0 ? Config->ContentDbPort : Config->DatabasePort Config->ContentDbPort
)) { )) {
LogError("Cannot continue without a content database connection"); LogError("Cannot continue without a content database connection");
std::exit(1); std::exit(1);

10
zone/main.cpp
View File

@ -242,11 +242,11 @@ int main(int argc, char** argv) {
*/ */
if (!Config->ContentDbHost.empty()) { if (!Config->ContentDbHost.empty()) {
if (!content_db.Connect( if (!content_db.Connect(
!Config->ContentDbHost.empty() ? Config->ContentDbHost.c_str() : Config->DatabaseHost.c_str(), Config->ContentDbHost.c_str() ,
!Config->ContentDbUsername.empty() ? Config->ContentDbUsername.c_str() : Config->DatabaseUsername.c_str(), Config->ContentDbUsername.c_str(),
!Config->ContentDbPassword.empty() ? Config->ContentDbPassword.c_str() : Config->DatabasePassword.c_str(), Config->ContentDbPassword.c_str(),
!Config->ContentDbName.empty() ? Config->ContentDbName.c_str() : Config->DatabaseDB.c_str(), Config->ContentDbName.c_str(),
Config->ContentDbPort != 0 ? Config->ContentDbPort : Config->DatabasePort Config->ContentDbPort
)) { )) {
LogError("Cannot continue without a content database connection"); LogError("Cannot continue without a content database connection");
return 1; return 1;