aboutsummaryrefslogtreecommitdiff
path: root/src/server/authserver
diff options
context:
space:
mode:
authorMachiavelli <none@none>2010-12-13 09:18:49 +0100
committerMachiavelli <none@none>2010-12-13 09:18:49 +0100
commitea29d87dccc50d985e90c013c128c34a0b8299f7 (patch)
tree40e2ebedc048e4194a65faf9aa0b34e80af0a197 /src/server/authserver
parentf5d6319d4ddd35a9be9ea886aa119465360e397e (diff)
Backed out changeset: 8326a2411148
--HG-- branch : trunk
Diffstat (limited to 'src/server/authserver')
-rwxr-xr-xsrc/server/authserver/Main.cpp10
-rw-r--r--src/server/authserver/authserver.conf.dist10
2 files changed, 7 insertions, 13 deletions
diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp
index 454cc83fc1b..7f7d2e39561 100755
--- a/src/server/authserver/Main.cpp
+++ b/src/server/authserver/Main.cpp
@@ -344,15 +344,15 @@ bool StartDB()
worker_threads = 1;
}
- uint8 connections = sConfig.GetIntDefault("LoginDatabase.Connections", 2);
- if (connections < 1 || connections > 32)
+ uint8 synch_threads = sConfig.GetIntDefault("LoginDatabase.SynchThreads", 1);
+ if (synch_threads < 1 || synch_threads > 32)
{
- sLog.outError("Improper value specified for LoginDatabase.Connections, defaulting to 2.");
- connections = 2;
+ sLog.outError("Improper value specified for LoginDatabase.SynchThreads, defaulting to 1.");
+ synch_threads = 1;
}
/// NOTE: While authserver is singlethreaded you should keep synch_threads == 1. Increasing it is just silly since only 1 will be used ever.
- if (!LoginDatabase.Open(dbstring.c_str(), worker_threads, connections))
+ if (!LoginDatabase.Open(dbstring.c_str(), worker_threads, synch_threads))
{
sLog.outError("Cannot connect to database");
return false;
diff --git a/src/server/authserver/authserver.conf.dist b/src/server/authserver/authserver.conf.dist
index 6fed0efe0ed..9c14178a0a0 100644
--- a/src/server/authserver/authserver.conf.dist
+++ b/src/server/authserver/authserver.conf.dist
@@ -224,17 +224,11 @@ LoginDatabaseInfo = "127.0.0.1;3306;trinity;trinity;auth"
#
# LoginDatabase.WorkerThreads
# Description: The amount of worker threads spawned to handle asynchronous (delayed) MySQL
-# statements.
+# statements. Each worker thread is mirrored with its own connection to the
+# MySQL server and their own thread on the MySQL server.
# Default: 1 - (LoginDatabase.WorkerThreads)
LoginDatabase.WorkerThreads = 1
#
-# LoginDatabase.Connections
-# Description: The amount of MySQL connections spawned.
-# Default: 1
-
-LoginDatabase.Connections = 1
-
-#
###################################################################################################