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

Add connection label to MySQL connects

Browse Source
This commit is contained in:
Akkadius 2020-07-07 02:06:00 -05:00
parent b7e2261e16
commit 331eb51126
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/database.cpp
View File

@ -61,15 +61,15 @@ Database::Database(const char* host, const char* user, const char* passwd, const
Connect(host, user, passwd, database, port); Connect(host, user, passwd, database, port);
} }
bool Database::Connect(const char* host, const char* user, const char* passwd, const char* database, uint32 port) { bool Database::Connect(const char* host, const char* user, const char* passwd, const char* database, uint32 port, std::string connection_label) {
uint32 errnum= 0; uint32 errnum= 0;
char errbuf[MYSQL_ERRMSG_SIZE]; char errbuf[MYSQL_ERRMSG_SIZE];
if (!Open(host, user, passwd, database, port, &errnum, errbuf)) { if (!Open(host, user, passwd, database, port, &errnum, errbuf)) {
LogError("Failed to connect to database: Error: {}", errbuf); LogError("[MySQL] Connection [{}] Failed to connect to database: Error [{}]", connection_label, errbuf);
return false; return false;
} }
else { else {
LogInfo("Using database [{}] at [{}]:[{}]", database, host,port); LogInfo("[MySQL] Connection [{}] database [{}] at [{}]:[{}]", connection_label, database, host,port);
return true; return true;
} }
} }

2
common/database.h
View File

@ -100,7 +100,7 @@ class Database : public DBcore {
public: public:
Database(); Database();
Database(const char* host, const char* user, const char* passwd, const char* database,uint32 port); Database(const char* host, const char* user, const char* passwd, const char* database,uint32 port);
bool Connect(const char* host, const char* user, const char* passwd, const char* database, uint32 port); bool Connect(const char* host, const char* user, const char* passwd, const char* database, uint32 port, std::string connection_label = "default");
~Database(); ~Database();
/* Character Creation */ /* Character Creation */

2
common/version.h
View File

@ -34,7 +34,7 @@
* Manifest: https://github.com/EQEmu/Server/blob/master/utils/sql/db_update_manifest.txt * Manifest: https://github.com/EQEmu/Server/blob/master/utils/sql/db_update_manifest.txt
*/ */
#define CURRENT_BINARY_DATABASE_VERSION 9153 #define CURRENT_BINARY_DATABASE_VERSION 9154
#ifdef BOTS #ifdef BOTS
#define CURRENT_BINARY_BOTS_DATABASE_VERSION 9027 #define CURRENT_BINARY_BOTS_DATABASE_VERSION 9027

3
world/main.cpp
View File

@ -154,7 +154,8 @@ void LoadDatabaseConnections()
Config->ContentDbUsername.c_str(), Config->ContentDbUsername.c_str(),
Config->ContentDbPassword.c_str(), Config->ContentDbPassword.c_str(),
Config->ContentDbName.c_str(), Config->ContentDbName.c_str(),
Config->ContentDbPort Config->ContentDbPort,
"content"
)) { )) {
LogError("Cannot continue without a content database connection"); LogError("Cannot continue without a content database connection");
std::exit(1); std::exit(1);

3
zone/main.cpp
View File

@ -260,7 +260,8 @@ int main(int argc, char** argv) {
Config->ContentDbUsername.c_str(), Config->ContentDbUsername.c_str(),
Config->ContentDbPassword.c_str(), Config->ContentDbPassword.c_str(),
Config->ContentDbName.c_str(), Config->ContentDbName.c_str(),
Config->ContentDbPort Config->ContentDbPort,
"content"
)) { )) {
LogError("Cannot continue without a content database connection"); LogError("Cannot continue without a content database connection");
return 1; return 1;