add lua config options for all zenhubserver command line options (#904)

- Improvement: Hub server now supports Lua config file for all hub-specific options
  - `hub.upstreamnotification.*` - upstream notification endpoint and instance ID
  - `hub.consul.*` - service registration endpoint, token, health interval, deregister timeout
  - `hub.instance.*` - base port, HTTP class, thread count, core limit, config path
  - `hub.instance.limits.*` - instance count cap, disk and memory usage limits
  - `hub.hydration.*` - hydration target spec and config path
  - `hub.watchdog.*` - cycle timing, inactivity timeouts, and activity check timeouts
- Improvement: Added `--hub-instance-base-port-number` as an alias for `--hub-base-port-number`, and `--upstream-notification-instance-id` as an alias for `--instance-id`
- Improvement: Added hub mode documentation at docs/hub.md

1 files changed, 81 insertions, 3 deletions

diff --git a/src/zenserver/hub/zenhubserver.cpp b/src/zenserver/hub/zenhubserver.cpp
index 499586abc..ff07130d6 100644
--- a/src/zenserver/hub/zenhubserver.cpp
+++ b/src/zenserver/hub/zenhubserver.cpp
@@ -2,6 +2,7 @@
 
 #include "zenhubserver.h"
 
+#include "config/luaconfig.h"
 #include "frontend/frontend.h"
 #include "httphubservice.h"
 #include "hub.h"
@@ -58,12 +59,19 @@ ZenHubServerConfigurator::AddCliOptions(cxxopts::Options& Options)
 	Options.add_option("hub",
 					   "",
 					   "instance-id",
-					   "Instance ID for use in notifications",
+					   "Instance ID for use in notifications (deprecated, use --upstream-notification-instance-id)",
 					   cxxopts::value<std::string>(m_ServerOptions.InstanceId)->default_value(""),
 					   "");
 
 	Options.add_option("hub",
 					   "",
+					   "upstream-notification-instance-id",
+					   "Instance ID for use in notifications",
+					   cxxopts::value<std::string>(m_ServerOptions.InstanceId),
+					   "");
+
+	Options.add_option("hub",
+					   "",
 					   "consul-endpoint",
 					   "Consul endpoint URL for service registration (empty = disabled)",
 					   cxxopts::value<std::string>(m_ServerOptions.ConsulEndpoint)->default_value(""),
@@ -94,12 +102,19 @@ ZenHubServerConfigurator::AddCliOptions(cxxopts::Options& Options)
 	Options.add_option("hub",
 					   "",
 					   "hub-base-port-number",
-					   "Base port number for provisioned instances",
+					   "Base port number for provisioned instances (deprecated, use --hub-instance-base-port-number)",
 					   cxxopts::value<uint16_t>(m_ServerOptions.HubBasePortNumber)->default_value("21000"),
 					   "");
 
 	Options.add_option("hub",
 					   "",
+					   "hub-instance-base-port-number",
+					   "Base port number for provisioned instances",
+					   cxxopts::value<uint16_t>(m_ServerOptions.HubBasePortNumber),
+					   "");
+
+	Options.add_option("hub",
+					   "",
 					   "hub-instance-limit",
 					   "Maximum number of provisioned instances for this hub",
 					   cxxopts::value<int>(m_ServerOptions.HubInstanceLimit)->default_value("1000"),
@@ -249,7 +264,70 @@ ZenHubServerConfigurator::AddCliOptions(cxxopts::Options& Options)
 void
 ZenHubServerConfigurator::AddConfigOptions(LuaConfig::Options& Options)
 {
-	ZEN_UNUSED(Options);
+	using namespace std::literals;
+
+	Options.AddOption("hub.upstreamnotification.endpoint"sv,
+					  m_ServerOptions.UpstreamNotificationEndpoint,
+					  "upstream-notification-endpoint"sv);
+	Options.AddOption("hub.upstreamnotification.instanceid"sv, m_ServerOptions.InstanceId, "upstream-notification-instance-id"sv);
+
+	Options.AddOption("hub.consul.endpoint"sv, m_ServerOptions.ConsulEndpoint, "consul-endpoint"sv);
+	Options.AddOption("hub.consul.tokenenv"sv, m_ServerOptions.ConsulTokenEnv, "consul-token-env"sv);
+	Options.AddOption("hub.consul.healthintervalseconds"sv,
+					  m_ServerOptions.ConsulHealthIntervalSeconds,
+					  "consul-health-interval-seconds"sv);
+	Options.AddOption("hub.consul.deregisterafterseconds"sv,
+					  m_ServerOptions.ConsulDeregisterAfterSeconds,
+					  "consul-deregister-after-seconds"sv);
+
+	Options.AddOption("hub.instance.baseportnumber"sv, m_ServerOptions.HubBasePortNumber, "hub-instance-base-port-number"sv);
+	Options.AddOption("hub.instance.http"sv, m_ServerOptions.HubInstanceHttpClass, "hub-instance-http"sv);
+	Options.AddOption("hub.instance.httpthreads"sv, m_ServerOptions.HubInstanceHttpThreadCount, "hub-instance-http-threads"sv);
+	Options.AddOption("hub.instance.corelimit"sv, m_ServerOptions.HubInstanceCoreLimit, "hub-instance-corelimit"sv);
+	Options.AddOption("hub.instance.config"sv, m_ServerOptions.HubInstanceConfigPath, "hub-instance-config"sv);
+	Options.AddOption("hub.instance.limits.count"sv, m_ServerOptions.HubInstanceLimit, "hub-instance-limit"sv);
+	Options.AddOption("hub.instance.limits.disklimitbytes"sv,
+					  m_ServerOptions.HubProvisionDiskLimitBytes,
+					  "hub-provision-disk-limit-bytes"sv);
+	Options.AddOption("hub.instance.limits.disklimitpercent"sv,
+					  m_ServerOptions.HubProvisionDiskLimitPercent,
+					  "hub-provision-disk-limit-percent"sv);
+	Options.AddOption("hub.instance.limits.memorylimitbytes"sv,
+					  m_ServerOptions.HubProvisionMemoryLimitBytes,
+					  "hub-provision-memory-limit-bytes"sv);
+	Options.AddOption("hub.instance.limits.memorylimitpercent"sv,
+					  m_ServerOptions.HubProvisionMemoryLimitPercent,
+					  "hub-provision-memory-limit-percent"sv);
+
+	Options.AddOption("hub.hydration.targetspec"sv, m_ServerOptions.HydrationTargetSpecification, "hub-hydration-target-spec"sv);
+	Options.AddOption("hub.hydration.targetconfig"sv, m_ServerOptions.HydrationTargetConfigPath, "hub-hydration-target-config"sv);
+
+	Options.AddOption("hub.watchdog.cycleintervalms"sv, m_ServerOptions.WatchdogConfig.CycleIntervalMs, "hub-watchdog-cycle-interval-ms"sv);
+	Options.AddOption("hub.watchdog.cycleprocessingbudgetms"sv,
+					  m_ServerOptions.WatchdogConfig.CycleProcessingBudgetMs,
+					  "hub-watchdog-cycle-processing-budget-ms"sv);
+	Options.AddOption("hub.watchdog.instancecheckthrottlems"sv,
+					  m_ServerOptions.WatchdogConfig.InstanceCheckThrottleMs,
+					  "hub-watchdog-instance-check-throttle-ms"sv);
+	Options.AddOption("hub.watchdog.provisionedinactivitytimeoutseconds"sv,
+					  m_ServerOptions.WatchdogConfig.ProvisionedInactivityTimeoutSeconds,
+					  "hub-watchdog-provisioned-inactivity-timeout-seconds"sv);
+	Options.AddOption("hub.watchdog.hibernatedinactivitytimeoutseconds"sv,
+					  m_ServerOptions.WatchdogConfig.HibernatedInactivityTimeoutSeconds,
+					  "hub-watchdog-hibernated-inactivity-timeout-seconds"sv);
+	Options.AddOption("hub.watchdog.inactivitycheckmarginseconds"sv,
+					  m_ServerOptions.WatchdogConfig.InactivityCheckMarginSeconds,
+					  "hub-watchdog-inactivity-check-margin-seconds"sv);
+	Options.AddOption("hub.watchdog.activitycheckconnecttimeoutms"sv,
+					  m_ServerOptions.WatchdogConfig.ActivityCheckConnectTimeoutMs,
+					  "hub-watchdog-activity-check-connect-timeout-ms"sv);
+	Options.AddOption("hub.watchdog.activitycheckrequesttimeoutms"sv,
+					  m_ServerOptions.WatchdogConfig.ActivityCheckRequestTimeoutMs,
+					  "hub-watchdog-activity-check-request-timeout-ms"sv);
+
+#if ZEN_PLATFORM_WINDOWS
+	Options.AddOption("hub.usejobobject"sv, m_ServerOptions.HubUseJobObject, "hub-use-job-object"sv);
+#endif
 }
 
 void