aboutsummaryrefslogtreecommitdiff
path: root/src/zenserver
diff options
context:
space:
mode:
Diffstat (limited to 'src/zenserver')
-rw-r--r--src/zenserver/config/config.cpp10
-rw-r--r--src/zenserver/main.cpp2
2 files changed, 11 insertions, 1 deletions
diff --git a/src/zenserver/config/config.cpp b/src/zenserver/config/config.cpp
index 60ae93853..fb88acab3 100644
--- a/src/zenserver/config/config.cpp
+++ b/src/zenserver/config/config.cpp
@@ -168,6 +168,9 @@ ZenServerConfiguratorBase::AddCommonConfigOptions(LuaConfig::Options& LuaOptions
LuaOptions.AddOption("network.httpsys.requestlogging"sv,
ServerOptions.HttpConfig.HttpSys.IsRequestLoggingEnabled,
"httpsys-enable-request-logging"sv);
+ LuaOptions.AddOption("network.httpsys.explicitiopool"sv,
+ ServerOptions.HttpConfig.HttpSys.UseExplicitIoThreadPool,
+ "httpsys-explicit-iopool"sv);
LuaOptions.AddOption("network.httpsys.httpsport"sv, ServerOptions.HttpConfig.HttpSys.HttpsPort, "httpsys-https-port"sv);
LuaOptions.AddOption("network.httpsys.certthumbprint"sv, ServerOptions.HttpConfig.HttpSys.CertThumbprint, "httpsys-cert-thumbprint"sv);
LuaOptions.AddOption("network.httpsys.certstorename"sv, ServerOptions.HttpConfig.HttpSys.CertStoreName, "httpsys-cert-store"sv);
@@ -383,6 +386,13 @@ ZenServerCmdLineOptions::AddCliOptions(cxxopts::Options& options, ZenServerConfi
options.add_option("httpsys",
"",
+ "httpsys-explicit-iopool",
+ "Use explicit IOCP thread pool instead of Windows Thread Pool",
+ cxxopts::value<bool>(ServerOptions.HttpConfig.HttpSys.UseExplicitIoThreadPool)->default_value("false"),
+ "<explicit iopool>");
+
+ options.add_option("httpsys",
+ "",
"httpsys-https-port",
"HTTPS listen port for http.sys (0 = disabled)",
cxxopts::value<int>(ServerOptions.HttpConfig.HttpSys.HttpsPort)->default_value("0"),
diff --git a/src/zenserver/main.cpp b/src/zenserver/main.cpp
index 26ae85ae1..23d497308 100644
--- a/src/zenserver/main.cpp
+++ b/src/zenserver/main.cpp
@@ -284,7 +284,7 @@ main(int argc, char* argv[])
//
// This isn't a great solution, but for now it seems to help reduce
// shutdown crashes observed in some situations.
- WaitForThreads(1000);
+ WaitForThreads(10);
});
#endif