aboutsummaryrefslogtreecommitdiff
path: root/src/server/worldserver/Main.cpp
diff options
context:
space:
mode:
authorDDuarte <dnpd.dd@gmail.com>2016-03-28 02:02:29 +0100
committerDDuarte <dnpd.dd@gmail.com>2016-03-28 02:36:58 +0100
commit423bded9a61e3f1c51ba00327898126c4e3a3f53 (patch)
tree6ba07fa8ba0dc2f63e06a5ebeb07b12a67d0f37d /src/server/worldserver/Main.cpp
parent06b3bca0d2bf6f049128da110681a5244d90225a (diff)
Core/Network: Change SocketMgr.StartNetwork to take the thread count by arg instead of config
AuthSocketMgr doesn't need "Network.Threads" config Fixes "Missing name Network.Threads in config file authserver.conf" Ref #16859 (cherry picked from commit 980f28d2ce099f524abdb6faed3fe59ce4c0963a) # Conflicts: # src/server/authserver/Server/AuthSocketMgr.h # src/server/game/Server/WorldSocketMgr.cpp
Diffstat (limited to 'src/server/worldserver/Main.cpp')
-rw-r--r--src/server/worldserver/Main.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index 8c801736ef4..767fe322056 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -221,7 +221,15 @@ extern int main(int argc, char** argv)
uint16 worldPort = uint16(sWorld->getIntConfig(CONFIG_PORT_WORLD));
std::string worldListener = sConfigMgr->GetStringDefault("BindIP", "0.0.0.0");
- sWorldSocketMgr.StartNetwork(_ioService, worldListener, worldPort);
+ int networkThreads = sConfigMgr->GetIntDefault("Network.Threads", 1);
+
+ if (networkThreads <= 0)
+ {
+ TC_LOG_ERROR("server.worldserver", "Network.Threads cannot be less than 0");
+ return false;
+ }
+
+ sWorldSocketMgr.StartNetwork(_ioService, worldListener, worldPort, networkThreads);
// Set server online (allow connecting now)
LoginDatabase.DirectPExecute("UPDATE realmlist SET flag = flag & ~%u, population = 0 WHERE id = '%u'", REALM_FLAG_OFFLINE, realm.Id.Realm);