0005772: Add cluster information to info URI

JumpMind · Apr 5, 2023 · d82b6bc · d82b6bc
1 parent 93917d0
commit d82b6bc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/symmetric-server/src/main/java/org/jumpmind/symmetric/web/InfoUriHandler.java b/symmetric-server/src/main/java/org/jumpmind/symmetric/web/InfoUriHandler.java
@@ -34,6 +34,7 @@
 import org.jumpmind.symmetric.common.ParameterConstants;
 import org.jumpmind.symmetric.model.Node;
 import org.jumpmind.symmetric.model.NodeGroupLink;
+import org.jumpmind.symmetric.service.IClusterService;
 import org.jumpmind.symmetric.service.IConfigurationService;
 import org.jumpmind.symmetric.service.INodeService;
 import org.jumpmind.symmetric.service.IParameterService;
@@ -44,13 +45,15 @@
 public class InfoUriHandler extends AbstractUriHandler {
     private INodeService nodeService;
     private IConfigurationService configurationService;
+    private IClusterService clusterService;
 
     public InfoUriHandler(IParameterService parameterService,
             INodeService nodeService,
-            IConfigurationService configurationService, IInterceptor[] interceptors) {
+            IConfigurationService configurationService, IClusterService clusterService, IInterceptor[] interceptors) {
         super("/info/*", parameterService, interceptors);
         this.nodeService = nodeService;
         this.configurationService = configurationService;
+        this.clusterService = clusterService;
     }
 
     public void handle(HttpServletRequest req, HttpServletResponse res) throws IOException,
@@ -93,6 +96,11 @@ public void handle(HttpServletRequest req, HttpServletResponse res) throws IOExc
             }
         }
         properties.setProperty(InfoConstants.BULK_LOADER_ENABLED, String.valueOf(configurationService.isBulkLoaderEnabled()));
+        boolean isClustered = parameterService.is(ParameterConstants.CLUSTER_LOCKING_ENABLED);
+        properties.setProperty(ParameterConstants.CLUSTER_LOCKING_ENABLED, Boolean.toString(isClustered));
+        if (isClustered) {
+            properties.setProperty(ParameterConstants.CLUSTER_SERVER_ID, clusterService.getServerId());
+        }
         properties.store(res.getOutputStream(), "SymmetricDS");
         res.flushBuffer();
     }

diff --git a/symmetric-server/src/main/java/org/jumpmind/symmetric/web/ServerSymmetricEngine.java b/symmetric-server/src/main/java/org/jumpmind/symmetric/web/ServerSymmetricEngine.java
@@ -91,7 +91,7 @@ protected void init() {
                 add(customInterceptors, authInterceptor, concurrencyInterceptor)));
         this.uriHandlers.add(new PingUriHandler(parameterService, customInterceptors));
         this.uriHandlers
-                .add(new InfoUriHandler(parameterService, nodeService, configurationService, customInterceptors));
+                .add(new InfoUriHandler(parameterService, nodeService, configurationService, clusterService, customInterceptors));
         this.uriHandlers.add(new BandwidthSamplerUriHandler(parameterService, add(customInterceptors, authInterceptor, concurrencyInterceptor)));
         this.uriHandlers.add(new PullUriHandler(parameterService, nodeService,
                 configurationService, dataExtractorService, registrationService, statisticManager, outgoingBatchService,