Author: markt
Date: Wed Feb 13 14:01:49 2019
New Revision: 1853508
URL: http://svn.apache.org/viewvc?rev=1853508&view=rev
Log: (empty)
Modified:
tomcat/trunk/bin/catalina.sh
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/bin/catalina.sh
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1853508&r1=1853507&r2=1853508&view=diff
==============================================================================
--- tomcat/trunk/bin/catalina.sh (original)
+++ tomcat/trunk/bin/catalina.sh Wed Feb 13 14:01:49 2019
@@ -33,14 +33,6 @@
# will be redirected.
# Default is $CATALINA_BASE/logs/catalina.out
#
-# CATALINA_OUT_CMD (Optional) Command which will be executed and receive
-# as its stdin the stdout and stderr from the Tomcat java
-# process. If CATALINA_OUT_CMD is set, the value of
-# CATALINA_OUT will be ignored.
-# No default.
-# Example (all one line)
-# CATALINA_OUT_CMD="cronolog
$CATALINA_BASE/logs/catalina.%Y-%m-%d.out >/dev/null 2>&1"
-#
# CATALINA_OPTS (Optional) Java runtime options used when the "start",
# "run" or "debug" command is executed.
# Include here and not in JAVA_OPTS all options, that should
@@ -451,23 +443,13 @@ elif [ "$1" = "start" ] ; then
fi
shift
- if [ -z "$CATALINA_OUT_CMD" ] ; then
- touch "$CATALINA_OUT"
- catalina_out_command=">> \"$CATALINA_OUT\" 2>&1"
- else
- catalina_out_command="| $CATALINA_OUT_CMD"
- fi
- if [ ! -z "$CATALINA_PID" ]; then
- catalina_pid_file="$CATALINA_PID"
- else
- catalina_pid_file=/dev/null
- fi
+ touch "$CATALINA_OUT"
if [ "$1" = "-security" ] ; then
if [ $have_tty -eq 1 ]; then
echo "Using Security Manager"
fi
shift
- eval \{ $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER
$JAVA_OPTS $CATALINA_OPTS \
+ eval $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER
$JAVA_OPTS $CATALINA_OPTS \
-D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \
-classpath "\"$CLASSPATH\"" \
-Djava.security.manager \
@@ -476,20 +458,24 @@ elif [ "$1" = "start" ] ; then
-Dcatalina.home="\"$CATALINA_HOME\"" \
-Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \
org.apache.catalina.startup.Bootstrap "$@" start \
- 2\>\&1 \&\& echo \$! \>\"$catalina_pid_file\" \; \}
$catalina_out_command "&"
+ >> "$CATALINA_OUT" 2>&1 "&"
else
- eval \{ $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER
$JAVA_OPTS $CATALINA_OPTS \
+ eval $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER
$JAVA_OPTS $CATALINA_OPTS \
-D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \
-classpath "\"$CLASSPATH\"" \
-Dcatalina.base="\"$CATALINA_BASE\"" \
-Dcatalina.home="\"$CATALINA_HOME\"" \
-Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \
org.apache.catalina.startup.Bootstrap "$@" start \
- 2\>\&1 \&\& echo \$! \>\"$catalina_pid_file\" \; \}
$catalina_out_command "&"
+ >> "$CATALINA_OUT" 2>&1 "&"
fi
+ if [ ! -z "$CATALINA_PID" ]; then
+ echo $! > "$CATALINA_PID"
+ fi
+
echo "Tomcat started."
elif [ "$1" = "stop" ] ; then
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1853508&r1=1853507&r2=1853508&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Feb 13 14:01:49 2019
@@ -108,6 +108,12 @@
Expand the coverage and quality of the French translations provided
with Apache Tomcat. (remm)
</add>
+ <fix>
+ <bug>63041</bug>: Revert the changes for <bug>53930</bug> that added
+ support for the <code>CATALINA_OUT_CMD</code> environment variable as
+ they prevented correct operation with systemd configurations that did
+ not explicitly specify a PID file. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
