This is an automated email from the ASF dual-hosted git repository.
dsoumis pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new a83979963a Fix BZ 69584 - Include missing "$CATALINA_LOGGING_CONFIG"
in catalina.sh commands
a83979963a is described below
commit a83979963ad2c0f2812323610a27883176352bba
Author: Dimitris Soumis <[email protected]>
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 959a637389..3ae29bc8eb 100755
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -521,7 +521,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\"" \
@@ -607,7 +607,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: [email protected]
For additional commands, e-mail: [email protected]
