diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-23 06:32:44 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-23 06:32:44 +0200 |
| commit | 8bc519a308ab78b1d6b243f49b332ddd9dd4ae17 (patch) | |
| tree | 95c92ba85108b8df3b9f58027034accba018a9d1 /src/server/worldserver | |
| parent | 059f3030b4b842a241e2f526b60f5a48956ee5e6 (diff) | |
| parent | 1bebe15698bea8ff314bfdf93b205e9dc17aeced (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
Diffstat (limited to 'src/server/worldserver')
| -rw-r--r-- | src/server/worldserver/worldserver.conf.dist | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index e482e3d4c37..fcb4010075f 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -147,10 +147,15 @@ BindIP = "0.0.0.0" # # ThreadPool # Description: Number of threads to be used for the global thread pool -# The thread pool is currently used for the signal handler and remote access -# Default: 1 +# The thread pool is currently used for: +# - Signal handling +# - Remote access +# - Database keep-alive ping +# - Core freeze check +# - World socket networking +# Default: 2 -ThreadPool = 1 +ThreadPool = 2 # ################################################################################################### |