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

dsoumis pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/11.0.x by this push:
     new 2d50aa64ea Fix BZ 69584 - Include missing "$CATALINA_LOGGING_CONFIG" 
in catalina.sh commands
2d50aa64ea is described below

commit 2d50aa64eaf0fe84272fc8556abdfa82b36dfad8
Author: Dimitris Soumis <jimsou...@gmail.com>
AuthorDate: Sat Feb 15 22:18:17 2025 +0200

    Fix BZ 69584 - Include missing "$CATALINA_LOGGING_CONFIG" in catalina.sh 
commands
    
    https://bz.apache.org/bugzilla/show_bug.cgi?id=69584
---
 bin/catalina.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/catalina.sh b/bin/catalina.sh
index c5a996cb65..4755c1576f 100755
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -470,7 +470,7 @@ elif [ "$1" = "stop" ] ; then
     fi
   fi
 
-  eval "\"$_RUNJAVA\"" $LOGGING_MANAGER "$JAVA_OPTS" \
+  eval "\"$_RUNJAVA\"" "\"$CATALINA_LOGGING_CONFIG\"" $LOGGING_MANAGER 
"$JAVA_OPTS" \
     -classpath "\"$CLASSPATH\"" \
     -Dcatalina.base="\"$CATALINA_BASE\"" \
     -Dcatalina.home="\"$CATALINA_HOME\"" \
@@ -556,7 +556,7 @@ elif [ "$1" = "stop" ] ; then
 
 elif [ "$1" = "configtest" ] ; then
 
-    eval "\"$_RUNJAVA\"" $LOGGING_MANAGER "$JAVA_OPTS" \
+    eval "\"$_RUNJAVA\"" "\"$CATALINA_LOGGING_CONFIG\"" $LOGGING_MANAGER 
"$JAVA_OPTS" \
       -classpath "\"$CLASSPATH\"" \
       -Dcatalina.base="\"$CATALINA_BASE\"" \
       -Dcatalina.home="\"$CATALINA_HOME\"" \


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to