[patch] patch to catalina.sh adding support for CATALINA_OUT_CMD

catalina.sh.patch (text/plain), 2.61 KB, created by Casey Lucas on 2012-09-24 15:53:47 UTC

(hide)

Description: patch to catalina.sh adding support for CATALINA_OUT_CMD

Filename:

MIME Type:

Creator: Casey Lucas

Created: 2012-09-24 15:53:47 UTC

Size: 2.61 KB

patch

obsolete

>Index: catalina.sh >=================================================================== >--- catalina.sh (revision 1389403) >+++ catalina.sh (working copy) >@@ -33,6 +33,13 @@ > # 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. Only used if CATALINA_OUT is not defined. >+# 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 >@@ -369,13 +376,22 @@ > fi > > shift >- touch "$CATALINA_OUT" >+ if [ -z "$CATALINA_OUT_CMD" ] ; then >+ 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 > if [ "$1" = "-security" ] ; then > if [ $have_tty -eq 1 ]; then > echo "Using Security Manager" > fi > shift >- eval \"$_RUNJAVA\" \"$LOGGING_CONFIG\" $JAVA_OPTS $CATALINA_OPTS \ >+ eval \{ \"$_RUNJAVA\" \"$LOGGING_CONFIG\" $JAVA_OPTS $CATALINA_OPTS \ > -Djava.endorsed.dirs=\"$JAVA_ENDORSED_DIRS\" -classpath \"$CLASSPATH\" \ > -Djava.security.manager \ > -Djava.security.policy==\"$CATALINA_BASE/conf/catalina.policy\" \ >@@ -383,23 +399,19 @@ > -Dcatalina.home=\"$CATALINA_HOME\" \ > -Djava.io.tmpdir=\"$CATALINA_TMPDIR\" \ > org.apache.catalina.startup.Bootstrap "$@" start \ >- >> "$CATALINA_OUT" 2>&1 "&" >+ 2\>\&1 \& echo \$! \>\"$catalina_pid_file\" \; \} $catalina_out_command "&" > > else >- eval \"$_RUNJAVA\" \"$LOGGING_CONFIG\" $JAVA_OPTS $CATALINA_OPTS \ >+ eval \{ \"$_RUNJAVA\" \"$LOGGING_CONFIG\" $JAVA_OPTS $CATALINA_OPTS \ > -Djava.endorsed.dirs=\"$JAVA_ENDORSED_DIRS\" -classpath \"$CLASSPATH\" \ > -Dcatalina.base=\"$CATALINA_BASE\" \ > -Dcatalina.home=\"$CATALINA_HOME\" \ > -Djava.io.tmpdir=\"$CATALINA_TMPDIR\" \ > org.apache.catalina.startup.Bootstrap "$@" start \ >- >> "$CATALINA_OUT" 2>&1 "&" >+ 2\>\&1 \& echo \$! \>\"$catalina_pid_file\" \; \} $catalina_out_command "&" > > fi > >- if [ ! -z "$CATALINA_PID" ]; then >- echo $! > "$CATALINA_PID" >- fi >- > elif [ "$1" = "stop" ] ; then > > shift View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]