diff options
| author | devil1234 <ingerasu1234@yahoo.com> | 2014-11-11 13:14:36 +0000 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2014-11-11 13:14:36 +0000 |
| commit | b978f0286c4ff1f00d4806b332f825df80c0112e (patch) | |
| tree | 376bb153c84b14fede7133fb1513c88ea19ebb34 /src/server/worldserver | |
| parent | e876201ac4341243507c8383fdd1bc77daa48f47 (diff) | |
Core/Databases: Add hotfix database to world config and prepared statement for it.
Closes #13533
Diffstat (limited to 'src/server/worldserver')
| -rw-r--r-- | src/server/worldserver/Main.cpp | 26 | ||||
| -rw-r--r-- | src/server/worldserver/worldserver.conf.dist | 6 |
2 files changed, 32 insertions, 0 deletions
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp index 821e1f5bd83..c46a1dffeec 100644 --- a/src/server/worldserver/Main.cpp +++ b/src/server/worldserver/Main.cpp @@ -80,6 +80,7 @@ uint32 _maxCoreStuckTimeInMs(0); WorldDatabaseWorkerPool WorldDatabase; ///< Accessor to the world database CharacterDatabaseWorkerPool CharacterDatabase; ///< Accessor to the character database +HotfixDatabaseWorkerPool HotfixDatabase; ///< Accessor to the hotfix database LoginDatabaseWorkerPool LoginDatabase; ///< Accessor to the realm/login database Battlenet::RealmHandle realmHandle; ///< Id of the realm Realm realm; @@ -570,6 +571,31 @@ bool StartDB() return false; } + ///- Get hotfix database info from configuration file + dbString = sConfigMgr->GetStringDefault("HotfixDatabaseInfo", ""); + if (dbString.empty()) + { + TC_LOG_ERROR("server.worldserver", "Hotfix database not specified in configuration file"); + return false; + } + + asyncThreads = uint8(sConfigMgr->GetIntDefault("HotfixDatabase.WorkerThreads", 1)); + if (asyncThreads < 1 || asyncThreads > 32) + { + TC_LOG_ERROR("server.worldserver", "Hotfix database: invalid number of worker threads specified. " + "Please pick a value between 1 and 32."); + return false; + } + + synchThreads = uint8(sConfigMgr->GetIntDefault("HotfixDatabase.SynchThreads", 2)); + + ///- Initialize the Hotfix database + if (!HotfixDatabase.Open(dbString, asyncThreads, synchThreads)) + { + TC_LOG_ERROR("server.worldserver", "Cannot connect to Hotfix database %s", dbString.c_str()); + return false; + } + ///- Get login database info from configuration file dbString = sConfigMgr->GetStringDefault("LoginDatabaseInfo", ""); if (dbString.empty()) diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index 6f042f73033..d7af94c133c 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -93,10 +93,12 @@ LogsDir = "" # Default: "127.0.0.1;3306;trinity;trinity;auth" - (LoginDatabaseInfo) # "127.0.0.1;3306;trinity;trinity;world" - (WorldDatabaseInfo) # "127.0.0.1;3306;trinity;trinity;characters" - (CharacterDatabaseInfo) +# "127.0.0.1;3306;trinity;trinity;hotfix" - (HotfixDatabaseInfo) LoginDatabaseInfo = "127.0.0.1;3306;trinity;trinity;auth" WorldDatabaseInfo = "127.0.0.1;3306;trinity;trinity;world" CharacterDatabaseInfo = "127.0.0.1;3306;trinity;trinity;characters" +HotfixDatabaseInfo = "127.0.0.1;3306;trinity;trinity;hotfix" # # LoginDatabase.WorkerThreads @@ -108,10 +110,12 @@ CharacterDatabaseInfo = "127.0.0.1;3306;trinity;trinity;characters" # Default: 1 - (LoginDatabase.WorkerThreads) # 1 - (WorldDatabase.WorkerThreads) # 1 - (CharacterDatabase.WorkerThreads) +# 1 - (HotfixDatabase.WorkerThreads) LoginDatabase.WorkerThreads = 1 WorldDatabase.WorkerThreads = 1 CharacterDatabase.WorkerThreads = 1 +HotfixDatabase.WorkerThreads = 1 # # LoginDatabase.SynchThreads @@ -121,10 +125,12 @@ CharacterDatabase.WorkerThreads = 1 # Default: 1 - (LoginDatabase.WorkerThreads) # 1 - (WorldDatabase.WorkerThreads) # 2 - (CharacterDatabase.WorkerThreads) +# 1 - (HotfixDatabase.WorkerThreads) LoginDatabase.SynchThreads = 1 WorldDatabase.SynchThreads = 1 CharacterDatabase.SynchThreads = 2 +HotfixDatabase.SynchThreads = 1 # # MaxPingTime |