[jena] branch main updated: JENA-2240: Be more careful setting default logging

[andy]

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

andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git


The following commit(s) were added to refs/heads/main by this push:
     new 670003c  JENA-2240: Be more careful setting default logging
     new ce63d2a  Merge pull request #1155 from afs/jena2240-dft-fuseki-logging
670003c is described below

commit 670003c7c948dd44c4bc2921791d236a38cf4d61
Author: Andy Seaborne <a...@apache.org>
AuthorDate: Tue Jan 4 13:23:35 2022 +0000

    JENA-2240: Be more careful setting default logging
---
 jena-fuseki2/apache-jena-fuseki/fuseki-server | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/jena-fuseki2/apache-jena-fuseki/fuseki-server 
b/jena-fuseki2/apache-jena-fuseki/fuseki-server
index c590517..08b419f 100755
--- a/jena-fuseki2/apache-jena-fuseki/fuseki-server
+++ b/jena-fuseki2/apache-jena-fuseki/fuseki-server
@@ -106,9 +106,11 @@ JVM_ARGS=${JVM_ARGS:--Xmx4G}
 
 ## Logging
 # Setting log4j2 with some other file.
-if [ -z "$LOGGING" ]
+DFT_LOG_CONF="$FUSEKI_HOME/log4j2.properties"
+if [ -z "$LOGGING" -a -e "$DFT_LOG_CONF" ]
 then
-    DFT_LOG_CONF="$FUSEKI_HOME/log4j2.properties"
+    # Set if no LOGGING and the default file does exist.
+    # Otherwise, the server will default to a built-in.
     LOGGING="-Dlog4j.configurationFile=$DFT_LOG_CONF"
 fi