From 866d02fb525ad611f0dfdaddf1e561ba5a0c3b0e Mon Sep 17 00:00:00 2001
From: Derry Hamilton <derryh@rasilon.net>
Date: Tue, 11 Jul 2023 14:07:37 +0100
Subject: [PATCH] Change how log4j finds its config.

log4j is reacting less well to reconfigurations, so this moves the config file location to earlier in the process, so that no class sees an unconfigured instance.
---
 install_extra/run_copying_job                                | 2 +-
 pom.xml                                                      | 2 +-
 src/main/java/com/rasilon/ujetl/CopyingApp.java              | 4 ----
 src/main/java/com/rasilon/ujetl/CopyingAppCommandParser.java | 4 ----
 src/test/java/com/rasilon/ujetl/TestParser.java              | 3 ---
 5 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/install_extra/run_copying_job b/install_extra/run_copying_job
index bf51414..5dfa2b0 100755
--- a/install_extra/run_copying_job
+++ b/install_extra/run_copying_job
@@ -30,9 +30,9 @@ fi
 /usr/bin/java \
     -Xms1g \
     -Xmx2g   \
+    -Dlog4j.configuration=file:"$LOG_PROPS" \
     -cp /usr/share/ujetl/lib/CopyingApp.jar \
     com.rasilon.ujetl.CopyingApp \
-    --log4j "$LOG_PROPS" \
     --config "/etc/ujetl/${JOBNAME}_config_live.xml"
 
 #rm -f $LOCKFILE
diff --git a/pom.xml b/pom.xml
index 304defa..043daad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
   <groupId>com.rasilon.ujetl</groupId>
   <artifactId>CopyingApp</artifactId>
   <packaging>jar</packaging>
-  <version>2.4.4</version>
+  <version>2.5.0</version>
   <name>uJETL</name>
   <url>https://github.com/rasilon/ujetl</url>
   <properties>
diff --git a/src/main/java/com/rasilon/ujetl/CopyingApp.java b/src/main/java/com/rasilon/ujetl/CopyingApp.java
index e1e47a5..1100d93 100644
--- a/src/main/java/com/rasilon/ujetl/CopyingApp.java
+++ b/src/main/java/com/rasilon/ujetl/CopyingApp.java
@@ -34,10 +34,6 @@ public class CopyingApp {
     public static void main(String[] args) {
         CopyingAppCommandParser cli = new CopyingAppCommandParser(args);
         LoggerContext context = (org.apache.logging.log4j.core.LoggerContext) LogManager.getContext(false);
-        String log4jConfigLocation = cli.getLog4jConfigFile();
-        File file = new File(log4jConfigLocation);
-        context.setConfigLocation(file.toURI());
-        System.out.println("Config set from "+file.toURI());
 
         CopyingApp app = new CopyingApp(cli);
         try {
diff --git a/src/main/java/com/rasilon/ujetl/CopyingAppCommandParser.java b/src/main/java/com/rasilon/ujetl/CopyingAppCommandParser.java
index b700221..97d2dc8 100644
--- a/src/main/java/com/rasilon/ujetl/CopyingAppCommandParser.java
+++ b/src/main/java/com/rasilon/ujetl/CopyingAppCommandParser.java
@@ -23,8 +23,4 @@ public class CopyingAppCommandParser {
 		return configFile;
 	}
 
-	public String getLog4jConfigFile() {
-		return log4jConfigFile;
-	}
-	
 }
diff --git a/src/test/java/com/rasilon/ujetl/TestParser.java b/src/test/java/com/rasilon/ujetl/TestParser.java
index 13366fd..398f046 100644
--- a/src/test/java/com/rasilon/ujetl/TestParser.java
+++ b/src/test/java/com/rasilon/ujetl/TestParser.java
@@ -13,15 +13,12 @@ public class TestParser {
     public void test001Parset() {
         try {
             String[] args = {
-                "--log4j",
-                "log4j_test_banana.xml",
                 "--config",
                 "config_test_banana.xml"
             };
             CopyingAppCommandParser p = new CopyingAppCommandParser(args);
 
             assertEquals(p.getConfigFile(),"config_test_banana.xml");
-            assertEquals(p.getLog4jConfigFile(),"log4j_test_banana.xml");
 
         } catch(Exception e) {
             fail(e.toString());