Author: kkolinko
Date: Tue Jan 26 04:57:43 2010
New Revision: 903078
URL: http://svn.apache.org/viewvc?rev=903078&view=rev
Log:
Make the location of stdout and stderr output configurable. Leave the default
as it always has been.
Currently, one can reconfigure the location of all logfiles except this one.
Patch by fhanik
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.sh
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=903078&r1=903077&r2=903078&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Jan 26 04:57:43 2010
@@ -95,12 +95,6 @@
+1: markt, kkolinko
-1:
-* Implement https://issues.apache.org/bugzilla/show_bug.cgi?id=37847
- Make location and filename of catalina.out configurable in catalina.sh
- http://svn.apache.org/viewvc?rev=881088&view=rev
- +1: kkolinko, markt, rjung
- -1:
-
* Provide new option to allow = in cookie values
http://people.apache.org/~markt/patches/2009-11-17-cookie-allow-equals.patch
+1: markt, kkolinko
Modified: tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.sh
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.sh?rev=903078&r1=903077&r2=903078&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.sh (original)
+++ tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.sh Tue Jan 26
04:57:43 2010
@@ -10,6 +10,10 @@
# of a Catalina installation. If not present, resolves to
# the same directory that CATALINA_HOME points to.
#
+# CATALINA_OUT (Optional) Full path to a file where stdout and stderr
+# will be redirected.
+# Default is $CATALINA_BASE/logs/catalina.out
+#
# CATALINA_OPTS (Optional) Java runtime options used when the "start",
# or "run" command is executed.
#
@@ -139,6 +143,10 @@
CATALINA_BASE="$CATALINA_HOME"
fi
+if [ -z "$CATALINA_OUT" ] ; then
+ CATALINA_OUT="$CATALINA_BASE"/logs/catalina.out
+fi
+
if [ -z "$CATALINA_TMPDIR" ] ; then
# Define the java.io.tmpdir to use for Catalina
CATALINA_TMPDIR="$CATALINA_BASE"/temp
@@ -261,7 +269,7 @@
elif [ "$1" = "start" ] ; then
shift
- touch "$CATALINA_BASE"/logs/catalina.out
+ touch "$CATALINA_OUT"
if [ "$1" = "-security" ] ; then
if [ $have_tty -eq 1 ]; then
echo "Using Security Manager"
@@ -275,7 +283,7 @@
-Dcatalina.home="$CATALINA_HOME" \
-Djava.io.tmpdir="$CATALINA_TMPDIR" \
org.apache.catalina.startup.Bootstrap "$@" start \
- >> "$CATALINA_BASE"/logs/catalina.out 2>&1 &
+ >> "$CATALINA_OUT" 2>&1 &
if [ ! -z "$CATALINA_PID" ]; then
echo $! > $CATALINA_PID
@@ -287,7 +295,7 @@
-Dcatalina.home="$CATALINA_HOME" \
-Djava.io.tmpdir="$CATALINA_TMPDIR" \
org.apache.catalina.startup.Bootstrap "$@" start \
- >> "$CATALINA_BASE"/logs/catalina.out 2>&1 &
+ >> "$CATALINA_OUT" 2>&1 &
if [ ! -z "$CATALINA_PID" ]; then
echo $! > $CATALINA_PID
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=903078&r1=903077&r2=903078&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Tue Jan 26
04:57:43 2010
@@ -62,6 +62,10 @@
Align server.xml installed by the Windows installer with the one
bundled in zip/tar.gz archives. (kkolinko)
</fix>
+ <add>
+ <bug>37847</bug>: Make location and filename of catalina.out
configurable
+ in catalina.sh. (fhanik/kkolinko)
+ </add>
</changelog>
</subsection>
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
