Merge pull request #141 from yersan/CLOUD-3188

[CLOUD-3188] Move GC logs to PREPEND_JAVA_OPTS to bypass the specific EAP checks
wildfly · Dec 10, 2019 · ebde0d3 · ebde0d3
2 parents 140cbd9 + 1c1586c
commit ebde0d3
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/...ontent/java/added/src/main/resources/packages/wildfly.s2i.java/content/bin/java-conf.conf b/...ontent/java/added/src/main/resources/packages/wildfly.s2i.java/content/bin/java-conf.conf
@@ -5,6 +5,14 @@ export GC_MAX_METASPACE_SIZE=${GC_MAX_METASPACE_SIZE:-256}
 
 JAVA_OPTS="$(adjust_java_options ${JAVA_OPTS})"
 
+# If JAVA_DIAGNOSTICS and there is jvm_specific_diagnostics, move the settings to PREPEND_JAVA_OPTS
+# to bypass the specific EAP checks done on JAVA_OPTS in standalone.sh that could remove the GC EAP specific log configurations
+JVM_SPECIFIC_DIAGNOSTICS=$(jvm_specific_diagnostics)
+if [ "x$JAVA_DIAGNOSTICS" != "x" ] && [ "x{JVM_SPECIFIC_DIAGNOSTICS}" != "x" ]; then
+  JAVA_OPTS=${JAVA_OPTS/${JVM_SPECIFIC_DIAGNOSTICS} /}
+  PREPEND_JAVA_OPTS="${JVM_SPECIFIC_DIAGNOSTICS} ${PREPEND_JAVA_OPTS}"
+fi
+
 # Make sure that we use /dev/urandom (CLOUD-422)
 JAVA_OPTS="${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom"