Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@www.apache.org Received: (qmail 48470 invoked from network); 24 Dec 2004 17:17:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 24 Dec 2004 17:17:42 -0000 Received: (qmail 26150 invoked by uid 500); 24 Dec 2004 17:17:39 -0000 Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 25173 invoked by uid 500); 24 Dec 2004 17:17:36 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 25158 invoked by uid 500); 24 Dec 2004 17:17:36 -0000 Received: (qmail 25152 invoked by uid 99); 24 Dec 2004 17:17:36 -0000 X-ASF-Spam-Status: No, hits=-9.6 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,UPPERCASE_25_50 X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Fri, 24 Dec 2004 09:17:35 -0800 Received: (qmail 48421 invoked by uid 1787); 24 Dec 2004 17:17:34 -0000 Date: 24 Dec 2004 17:17:34 -0000 Message-ID: <20041224171734.48420.qmail@minotaur.apache.org> From: markt@apache.org To: jakarta-tomcat-4.0-cvs@apache.org Subject: cvs commit: jakarta-tomcat-4.0/catalina/src/bin catalina.sh X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N markt 2004/12/24 09:17:34 Modified: catalina/src/bin catalina.sh Log: Fix bug 28305. Provide greater control over redirection of stdout and stderr - Patch provided by Daniel Rall Revision Changes Path 1.38 +13 -4 jakarta-tomcat-4.0/catalina/src/bin/catalina.sh Index: catalina.sh =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- catalina.sh 15 Aug 2004 15:20:15 -0000 1.37 +++ catalina.sh 24 Dec 2004 17:17:34 -0000 1.38 @@ -17,6 +17,9 @@ # the JVM should use (java.io.tmpdir). Defaults to # $CATALINA_BASE/temp. # +# CATALINA_OUT (Optional) Location of the file to which stdout and stderr +# are written. Defaults to $CATALINA_BASE/logs/catalina.out. +# # JAVA_HOME Must point at your Java Development Kit installation. # # JAVA_OPTS (Optional) Java runtime options used when the "start", @@ -115,6 +118,11 @@ CATALINA_TMPDIR="$CATALINA_BASE"/temp fi +if [ -z "$CATALINA_OUT" ] ; then + # Use default location for redirected stdout/stderr + CATALINA_OUT="$CATALINA_BASE"/logs/catalina.out +fi + # For Cygwin, switch paths to Windows format before running java if $cygwin; then JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` @@ -131,6 +139,7 @@ echo "Using CATALINA_BASE: $CATALINA_BASE" echo "Using CATALINA_HOME: $CATALINA_HOME" echo "Using CATALINA_TMPDIR: $CATALINA_TMPDIR" +echo "Using CATALINA_OUT: $CATALINA_OUT" echo "Using JAVA_HOME: $JAVA_HOME" if [ "$1" = "jpda" ] ; then @@ -214,7 +223,7 @@ elif [ "$1" = "start" ] ; then shift - touch "$CATALINA_BASE"/logs/catalina.out + touch "$CATALINA_OUT" if [ "$1" = "-security" ] ; then echo "Using Security Manager" shift @@ -226,7 +235,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 @@ -238,7 +247,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 --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org