Fixed #986 - Turn off ActiveMQ JMX By Default

JumpMind · Oct 11, 2021 · 8dea889 · 8dea889
1 parent 4277c24
commit 8dea889
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/metl-core/src/main/java/org/jumpmind/metl/core/util/EnvConstants.java b/metl-core/src/main/java/org/jumpmind/metl/core/util/EnvConstants.java
@@ -44,4 +44,6 @@ private EnvConstants() {
 
     public static final String LOG_FILE_PATTERN_LAYOUT = "log.file.pattern.layout";
 
+    public static final String JMX_ENABLED = "jmx.enabled";
+
 }
diff --git a/metl-ui/src/main/java/org/jumpmind/metl/ui/init/AppConfig.java b/metl-ui/src/main/java/org/jumpmind/metl/ui/init/AppConfig.java
@@ -1,5 +1,4 @@
 /**
- * Licensed to JumpMind Inc under one or more contributor
  * license agreements.  See the NOTICE file distributed
  * with this work for additional information regarding
  * copyright ownership.  JumpMind Inc licenses this file
@@ -523,7 +522,10 @@ Service brokerService() {
         if (brokerService == null) {
             try {
                 BrokerService broker = new BrokerService();
-                broker.setPersistent(false);
+            	broker.setPersistent(false);
+                if (env.getProperty(EnvConstants.JMX_ENABLED,"false").equalsIgnoreCase("false")) {
+                    broker.setUseJmx(false);
+                }
                 broker.getSystemUsage().getMemoryUsage().setLimit(10*1024*10);
                 broker.start();
                 brokerService = broker;

diff --git a/metl-ui/src/main/resources/metl.properties b/metl-ui/src/main/resources/metl.properties
@@ -29,4 +29,5 @@ execution.retention.time.ms.cancelled=60000
 log.to.console.enabled=true
 log.to.file.enabled=true
 table.prefix=metl
+jmx.enabled=false
 #log.file=