Author: fhanik
Date: Wed Nov 11 19:51:50 2009
New Revision: 835036
URL: http://svn.apache.org/viewvc?rev=835036&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.
Modified:
tomcat/trunk/bin/catalina.sh
Modified: tomcat/trunk/bin/catalina.sh
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=835036&r1=835035&r2=835036&view=diff
==============================================================================
--- tomcat/trunk/bin/catalina.sh (original)
+++ tomcat/trunk/bin/catalina.sh Wed Nov 11 19:51:50 2009
@@ -26,6 +26,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.
#
@@ -163,6 +167,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
@@ -307,7 +315,7 @@
fi
shift
- touch "$CATALINA_BASE"/logs/catalina.out
+ touch "$CATALINA_OUT"
if [ "$1" = "-security" ] ; then
if [ $have_tty -eq 1 ]; then
echo "Using Security Manager"
@@ -321,7 +329,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 &
else
"$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \
@@ -330,7 +338,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 &
fi
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
