(sling-org-apache-sling-distribution-journal) 01/02: SLING-12171 - Extract jmx creation

[cschneider]

This is an automated email from the ASF dual-hosted git repository.

cschneider pushed a commit to branch SLING-12171-2
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-journal.git

commit 4d64ac595ef09ef16b5ac24c288559b9cea5942a
Author: Christian Schneider <cschn...@adobe.com>
AuthorDate: Fri Dec 1 14:53:10 2023 +0100

    SLING-12171 - Extract jmx creation
---
 .../impl/publisher/DistributionPublisher.java      | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/distribution/journal/impl/publisher/DistributionPublisher.java
 
b/src/main/java/org/apache/sling/distribution/journal/impl/publisher/DistributionPublisher.java
index a81a210..976baff 100644
--- 
a/src/main/java/org/apache/sling/distribution/journal/impl/publisher/DistributionPublisher.java
+++ 
b/src/main/java/org/apache/sling/distribution/journal/impl/publisher/DistributionPublisher.java
@@ -151,16 +151,8 @@ public class DistributionPublisher implements 
DistributionAgent {
         
         distributionLogEventListener = new 
DistributionLogEventListener(context, log, pubAgentName);
 
-        DistPublisherJMX bean;
-        try {
-            bean = new DistPublisherJMX(pubAgentName, discoveryService, this);
-        } catch (NotCompliantMBeanException e) {
-            throw new RuntimeException(e);
-        }
-        reg = new JMXRegistration(bean, "agent", pubAgentName);
+        reg = createAndRegisterJMXBean();
         
-        String msg = format("Started Publisher agent %s with packageBuilder 
%s, queuedTimeout %s",
-                pubAgentName, pkgType, queuedTimeout);
         distributionMetricsService.createGauge(
                 DistributionMetricsService.PUB_COMPONENT + 
".subscriber_count;pub_name=" + pubAgentName,
                 () -> 
discoveryService.getTopologyView().getSubscribedAgentIds().size()
@@ -172,7 +164,8 @@ public class DistributionPublisher implements 
DistributionAgent {
                 HandlerAdapter.create(PackageStatusMessage.class, 
pubQueueProvider::handleStatus)
                 );
         
-        log.info(msg);
+        log.info("Started Publisher agent {} with packageBuilder {}, 
queuedTimeout {}",
+                pubAgentName, pkgType, queuedTimeout);
     }
 
     @Deactivate
@@ -184,6 +177,15 @@ public class DistributionPublisher implements 
DistributionAgent {
         log.info(msg);
     }
     
+    private JMXRegistration createAndRegisterJMXBean() {
+        try {
+            DistPublisherJMX bean = new DistPublisherJMX(pubAgentName, 
discoveryService, this);
+            return new JMXRegistration(bean, "agent", pubAgentName);
+        } catch (NotCompliantMBeanException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     private Dictionary<String, Object> 
createServiceProps(PublisherConfiguration config) {
         Dictionary<String, Object> props = new Hashtable<>();
         props.put("name", config.name());