From ea29d87dccc50d985e90c013c128c34a0b8299f7 Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Mon, 13 Dec 2010 09:18:49 +0100 Subject: Backed out changeset: 8326a2411148 --HG-- branch : trunk --- src/server/worldserver/Master.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/server/worldserver/Master.cpp') diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp index 4dede995597..ecfbdbc7d8e 100755 --- a/src/server/worldserver/Master.cpp +++ b/src/server/worldserver/Master.cpp @@ -419,7 +419,7 @@ bool Master::_StartDB() { sLog.SetLogDB(false); std::string dbstring; - uint8 async_threads, connections; + uint8 async_threads, synch_threads; dbstring = sConfig.GetStringDefault("WorldDatabaseInfo", ""); if (dbstring.empty()) @@ -436,10 +436,10 @@ bool Master::_StartDB() return false; } - connections = sConfig.GetIntDefault("WorldDatabase.Connections", 2); + synch_threads = sConfig.GetIntDefault("WorldDatabase.SynchThreads", 1); ///- Initialise the world database - if (!WorldDatabase.Open(dbstring, async_threads, connections)) + if (!WorldDatabase.Open(dbstring, async_threads, synch_threads)) { sLog.outError("Cannot connect to world database %s", dbstring.c_str()); return false; @@ -460,10 +460,10 @@ bool Master::_StartDB() return false; } - connections = sConfig.GetIntDefault("CharacterDatabase.Connections", 2); + synch_threads = sConfig.GetIntDefault("CharacterDatabase.SynchThreads", 2); ///- Initialise the Character database - if (!CharacterDatabase.Open(dbstring, async_threads, connections)) + if (!CharacterDatabase.Open(dbstring, async_threads, synch_threads)) { sLog.outError("Cannot connect to Character database %s", dbstring.c_str()); return false; @@ -485,10 +485,10 @@ bool Master::_StartDB() return false; } - connections = sConfig.GetIntDefault("LoginDatabase.Connections", 2); + synch_threads = sConfig.GetIntDefault("LoginDatabase.SynchThreads", 1); ///- Initialise the login database - if (!LoginDatabase.Open(dbstring, async_threads, connections)) + if (!LoginDatabase.Open(dbstring, async_threads, synch_threads)) { sLog.outError("Cannot connect to login database %s", dbstring.c_str()); return false; -- cgit v1.2.3