support Q2 arguments via q2.args environment

jpos · Mar 16, 2024 · 6f2658d · 6f2658d
1 parent c03744f
commit 6f2658d
Showing 1 changed file with 25 additions and 11 deletions.
diff --git a/jpos/src/main/java/org/jpos/q2/Q2.java b/jpos/src/main/java/org/jpos/q2/Q2.java
@@ -80,6 +80,8 @@
 import java.util.*;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Stream;
+
 import io.micrometer.core.instrument.binder.jvm.ClassLoaderMetrics;
 import io.micrometer.core.instrument.binder.jvm.JvmGcMetrics;
 import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
@@ -161,10 +163,11 @@ public class Q2 implements FileFilter, Runnable {
     private long shutdownHookDelay = 0L;
     public Q2 (String[] args) {
         super();
-        this.args = args;
+        parseCmdLine (args, true);
+        this.args = environmentArgs(args);
         startTime = Instant.now();
         instanceId = UUID.randomUUID();
-        parseCmdLine (args);
+        parseCmdLine (this.args, false);
         libDir     = new File (deployDir, "lib");
         dirMap     = new TreeMap<>();
         deployDir.mkdirs ();
@@ -710,7 +713,7 @@ private static String getLicensee() {
         }
         return s;
     }
-    private void parseCmdLine (String[] args) {
+    private void parseCmdLine (String[] args, boolean environmentOnly) {
         CommandLineParser parser = new DefaultParser ();
 
         Options options = new Options ();
@@ -743,6 +746,17 @@ private void parseCmdLine (String[] args) {
             System.setProperty("log4j2.formatMsgNoLookups", "true"); // log4shell prevention
 
             CommandLine line = parser.parse (options, args);
+            // set up envdir and env before other parts of the system, so env is available
+            // force reload if any of the env options was changed
+            if (line.hasOption("Ed")) {
+                System.setProperty("jpos.envdir", line.getOptionValue("Ed"));
+            }
+            if (line.hasOption("E")) {
+                System.setProperty("jpos.env", ISOUtil.commaEncode(line.getOptionValues("E")));
+            }
+
+            if (environmentOnly)
+
             if (line.hasOption ("v")) {
                 displayVersion();
                 System.exit (0);
@@ -753,14 +767,6 @@ private void parseCmdLine (String[] args) {
                 System.exit (0);
             } 
 
-            // set up envdir and env before other parts of the system, so env is available
-            // force reload if any of the env options was changed
-            if (line.hasOption("Ed")) {
-                System.setProperty("jpos.envdir", line.getOptionValue("Ed"));
-            }
-            if (line.hasOption("E")) {
-                System.setProperty("jpos.env", ISOUtil.commaEncode(line.getOptionValues("E")));
-            }
 
             if (line.hasOption ("c")) {
                 cli = new CLI(this, line.getOptionValue("c"), line.hasOption("i"));
@@ -1237,4 +1243,12 @@ private void registerMicroMeter () {
         new JvmThreadMetrics().bindTo(meterRegistry);
         meterRegistry.add (prometheusRegistry);
     }
+
+    public String[] environmentArgs (String[] args) {
+        String envArgs = Environment.getEnvironment().getProperty("${q2.args}", null);
+        return (envArgs != null ?
+            Stream.concat(
+              Arrays.stream(ISOUtil.commaDecode(envArgs)), Arrays.stream(args))
+                .toArray(String[]::new) : args);
+    }
 }