diff options
| author | Stefan Boberg <[email protected]> | 2026-03-17 23:34:29 +0100 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2026-03-17 23:34:29 +0100 |
| commit | d8d0bbcd788d2d3d20029bf729a7b1d20cd44afb (patch) | |
| tree | 08437c8fa5a253e000b9cd08e71b44801179f1f3 /src/zenserver/config | |
| parent | Fix crash handler: remove stack overflow case and fix misleading comment (diff) | |
| parent | add missing metadata for PS5 used by test scripts (diff) | |
| download | zen-sb/local-crashreports.tar.xz zen-sb/local-crashreports.zip | |
Merge branch 'main' into sb/local-crashreportssb/local-crashreports
Diffstat (limited to 'src/zenserver/config')
| -rw-r--r-- | src/zenserver/config/config.cpp | 7 | ||||
| -rw-r--r-- | src/zenserver/config/config.h | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/zenserver/config/config.cpp b/src/zenserver/config/config.cpp index 60ae93853..15f6f79f3 100644 --- a/src/zenserver/config/config.cpp +++ b/src/zenserver/config/config.cpp @@ -133,6 +133,7 @@ ZenServerConfiguratorBase::AddCommonConfigOptions(LuaConfig::Options& LuaOptions // server LuaOptions.AddOption("server.dedicated"sv, ServerOptions.IsDedicated, "dedicated"sv); + LuaOptions.AddOption("server.allowportprobing"sv, ServerOptions.AllowPortProbing, "allow-port-probing"sv); LuaOptions.AddOption("server.sentry.disable"sv, ServerOptions.SentryConfig.Disable, "no-sentry"sv); LuaOptions.AddOption("server.sentry.allowpersonalinfo"sv, ServerOptions.SentryConfig.AllowPII, "sentry-allow-personal-info"sv); LuaOptions.AddOption("server.sentry.dsn"sv, ServerOptions.SentryConfig.Dsn, "sentry-dsn"sv); @@ -223,8 +224,11 @@ ZenServerCmdLineOptions::AddCliOptions(cxxopts::Options& options, ZenServerConfi #endif options.add_options()("dedicated", - "Enable dedicated server mode", + "Enable dedicated server mode, disables '--allow-port-probing' and allocates more resources.", cxxopts::value<bool>(ServerOptions.IsDedicated)->default_value("false")); + options.add_options()("allow-port-probing", + "Allow searching for an available port, disabled if '--dedicated' is enabled.", + cxxopts::value<bool>(ServerOptions.AllowPortProbing)->default_value("true")); options.add_options()("d, debug", "Enable debugging", cxxopts::value<bool>(ServerOptions.IsDebug)->default_value("false")); options.add_options()("clean", "Clean out all state at startup", @@ -691,6 +695,7 @@ ZenServerConfiguratorBase::Configure(int argc, char* argv[]) } m_ServerOptions.HttpConfig.IsDedicatedServer = m_ServerOptions.IsDedicated; + m_ServerOptions.HttpConfig.AllowPortProbing = !m_ServerOptions.IsDedicated && m_ServerOptions.AllowPortProbing; } void diff --git a/src/zenserver/config/config.h b/src/zenserver/config/config.h index e481c7225..5078fe71a 100644 --- a/src/zenserver/config/config.h +++ b/src/zenserver/config/config.h @@ -61,6 +61,7 @@ struct ZenServerConfig int CoreLimit = 0; // If set, hardware concurrency queries are capped at this number int LieCpu = 0; bool IsDedicated = false; // Indicates a dedicated/shared instance, with larger resource requirements + bool AllowPortProbing = true; // Automatically false if IsDedicated is true bool ShouldCrash = false; // Option for testing crash handling bool IsFirstRun = false; std::filesystem::path ConfigFile; // Path to Lua config file |