`--consul-register-hub` option to disable hub parent service Consul registration (#939)

2 files changed, 34 insertions, 17 deletions

diff --git a/src/zenserver/hub/zenhubserver.cpp b/src/zenserver/hub/zenhubserver.cpp
index db988395c..a32c1f1d1 100644
--- a/src/zenserver/hub/zenhubserver.cpp
+++ b/src/zenserver/hub/zenhubserver.cpp
@@ -103,6 +103,13 @@ ZenHubServerConfigurator::AddCliOptions(cxxopts::Options& Options)
 
 	Options.add_option("hub",
 					   "",
+					   "consul-register-hub",
+					   "Register the hub parent service with Consul (instance registration is unaffected)",
+					   cxxopts::value<bool>(m_ServerOptions.ConsulRegisterHub)->default_value("true"),
+					   "");
+
+	Options.add_option("hub",
+					   "",
 					   "hub-base-port-number",
 					   "Base port number for provisioned instances (deprecated, use --hub-instance-base-port-number)",
 					   cxxopts::value<uint16_t>(m_ServerOptions.HubBasePortNumber)->default_value("21000"),
@@ -301,6 +308,7 @@ ZenHubServerConfigurator::AddConfigOptions(LuaConfig::Options& Options)
 	Options.AddOption("hub.consul.deregisterafterseconds"sv,
 					  m_ServerOptions.ConsulDeregisterAfterSeconds,
 					  "consul-deregister-after-seconds"sv);
+	Options.AddOption("hub.consul.registerhub"sv, m_ServerOptions.ConsulRegisterHub, "consul-register-hub"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);
@@ -728,6 +736,14 @@ ZenHubServer::InitializeConsulRegistration(const ZenHubServerConfig& ServerConfi
 		m_ConsulHealthIntervalSeconds  = ServerConfig.ConsulHealthIntervalSeconds;
 		m_ConsulDeregisterAfterSeconds = ServerConfig.ConsulDeregisterAfterSeconds;
 
+		if (!ServerConfig.ConsulRegisterHub)
+		{
+			ZEN_INFO(
+				"Hub parent Consul registration skipped (consul-register-hub is false); "
+				"instance registration remains enabled");
+			return;
+		}
+
 		consul::ServiceRegistrationInfo Info;
 		Info.ServiceId	 = fmt::format("zen-hub-{}", ServerConfig.InstanceId);
 		Info.ServiceName = "zen-hub";
diff --git a/src/zenserver/hub/zenhubserver.h b/src/zenserver/hub/zenhubserver.h
index 22791a648..9860cd629 100644
--- a/src/zenserver/hub/zenhubserver.h
+++ b/src/zenserver/hub/zenhubserver.h
@@ -37,23 +37,24 @@ struct ZenHubWatchdogConfig
 
 struct ZenHubServerConfig : public ZenServerConfig
 {
-	std::string			  UpstreamNotificationEndpoint;
-	std::string			  InstanceId;	   // For use in notifications
-	std::string			  ConsulEndpoint;  // If set, enables Consul service registration
-	std::string			  ConsulTokenEnv;  // Environment variable name to read a Consul token from; defaults to CONSUL_HTTP_TOKEN if empty
-	uint32_t			  ConsulHealthIntervalSeconds	  = 10;	 // Interval in seconds between Consul health checks
-	uint32_t			  ConsulDeregisterAfterSeconds	  = 30;	 // Seconds before Consul deregisters an unhealthy service
-	uint16_t			  HubBasePortNumber				  = 21000;
-	int					  HubInstanceLimit				  = 1000;
-	bool				  HubUseJobObject				  = true;
-	std::string			  HubInstanceHttpClass			  = "asio";
-	uint32_t			  HubInstanceHttpThreadCount	  = 0;	// Automatic
-	uint32_t			  HubInstanceProvisionThreadCount = 0;	// Synchronous provisioning
-	uint32_t			  HubHydrationThreadCount		  = 0;	// Synchronous hydration/dehydration
-	int					  HubInstanceCoreLimit			  = 0;	// Automatic
-	std::filesystem::path HubInstanceConfigPath;				// Path to Lua config file
-	std::string			  HydrationTargetSpecification;			// hydration/dehydration target specification
-	std::filesystem::path HydrationTargetConfigPath;  // path to JSON config file (mutually exclusive with HydrationTargetSpecification)
+	std::string UpstreamNotificationEndpoint;
+	std::string InstanceId;		 // For use in notifications
+	std::string ConsulEndpoint;	 // If set, enables Consul service registration
+	std::string ConsulTokenEnv;	 // Environment variable name to read a Consul token from; defaults to CONSUL_HTTP_TOKEN if empty
+	uint32_t	ConsulHealthIntervalSeconds	 = 10;	// Interval in seconds between Consul health checks
+	uint32_t	ConsulDeregisterAfterSeconds = 30;	// Seconds before Consul deregisters an unhealthy service
+	bool		ConsulRegisterHub	 = true;  // Whether to register the hub parent service with Consul (instance registration unaffected)
+	uint16_t	HubBasePortNumber	 = 21000;
+	int			HubInstanceLimit	 = 1000;
+	bool		HubUseJobObject		 = true;
+	std::string HubInstanceHttpClass = "asio";
+	uint32_t	HubInstanceHttpThreadCount		= 0;	 // Automatic
+	uint32_t	HubInstanceProvisionThreadCount = 0;	 // Synchronous provisioning
+	uint32_t	HubHydrationThreadCount			= 0;	 // Synchronous hydration/dehydration
+	int			HubInstanceCoreLimit			= 0;	 // Automatic
+	std::filesystem::path HubInstanceConfigPath;		 // Path to Lua config file
+	std::string			  HydrationTargetSpecification;	 // hydration/dehydration target specification
+	std::filesystem::path HydrationTargetConfigPath;	 // path to JSON config file (mutually exclusive with HydrationTargetSpecification)
 	ZenHubWatchdogConfig  WatchdogConfig;
 	uint64_t			  HubProvisionDiskLimitBytes	 = 0;
 	uint32_t			  HubProvisionDiskLimitPercent	 = 0;