[activemq-artemis] 03/04: action some TODOs, add some others

[ro...@apache.org]

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

robbie pushed a commit to branch new-logging
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git

commit f56c08a6d85e889596ae465a7cee2060523ba02b
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Fri Aug 26 13:35:19 2022 +0100

    action some TODOs, add some others
---
 .../java/org/apache/activemq/artemis/boot/Artemis.java  | 15 ---------------
 .../apache/activemq/artemis/utils/SpawnedVMSupport.java | 17 +++++------------
 2 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java b/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java
index 6b436506d9..bc23883dfb 100644
--- a/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java
+++ b/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java
@@ -116,13 +116,6 @@ public class Artemis {
          System.setProperty("java.io.tmpdir", new File(fileInstance, "tmp").getCanonicalPath());
       }
 
-      //TODO: Remove or update? We arent using this prop anymore.
-      // Lets try to covert the logging.configuration setting to a valid URI
-      String loggingConfig = System.getProperty("logging.configuration");
-      if (loggingConfig != null) {
-         System.setProperty("logging.configuration", fixupFileURI(loggingConfig));
-      }
-
       ClassLoader originalCL = Thread.currentThread().getContextClassLoader();
 
       // Now setup our classloader..
@@ -141,14 +134,6 @@ public class Artemis {
 
    }
 
-   static String fixupFileURI(String value) {
-      if (value != null && value.startsWith("file:")) {
-         value = value.substring("file:".length());
-         value = new File(value).toURI().toString();
-      }
-      return value;
-   }
-
    private static void add(ArrayList<URL> urls, File file) {
       try {
          urls.add(file.toURI().toURL());
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java
index b51ab02318..397654f47c 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java
@@ -212,20 +212,19 @@ public class SpawnedVMSupport {
          }
       }
 
-      // TODO: look into the usage of these (BEGINNING >)
       // The logs will be huge if you don't set this
       if (useLogging) {
-         commandList.add("-Djava.util.logging.manager=org.jboss.logmanager.LogManager");
-         commandList.add("-Dlogging.configuration=file:../config/logging.properties");
+         // TODO: visible uses appear to set this true, but we no longer do anything with it
+         // as we dont use the logging.configuration property anymore..remove method arg?
       }
 
       commandList.add("-Djava.io.tmpdir=" + System.getProperty("java.io.tmpdir", "./tmp"));
       commandList.add("-Djava.library.path=" + System.getProperty("java.library.path", "./native/bin"));
 
-      String loggingConfigFile = System.getProperty("java.util.logging.config.file");
-
+      String loggingConfigFile = System.getProperty("log4j2.configurationFile");
       if (loggingConfigFile != null) {
-         commandList.add("-Djava.util.logging.config.file=" + loggingConfigFile + " ");
+         // TODO: why does it add the trailing space here but not other places?
+         commandList.add("-Dlog4j2.configurationFile=" + loggingConfigFile + " ");
       }
 
       String jacocoAgent = System.getProperty("jacoco.agent");
@@ -233,12 +232,6 @@ public class SpawnedVMSupport {
          commandList.add(jacocoAgent);
       }
 
-      String loggingPlugin = System.getProperty("org.jboss.logging.Logger.pluginClass");
-      if (loggingPlugin != null) {
-         commandList.add("-Dorg.jboss.logging.Logger.pluginClass=" + loggingPlugin + " ");
-      }
-      // TODO: look into these (< END)
-
       commandList.add(className);
       for (String arg : args) {
          commandList.add(arg);