ports/152975: [maintainer-update] www/tomcat55: add cronolog as optional log processor for tomcat logs

[Jason Helfman]

>Number:         152975
>Category:       ports
>Synopsis:       [maintainer-update] www/tomcat55: add cronolog as optional log processor for tomcat logs
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 10 01:30:09 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Jason Helfman
>Release:        FreeBSD 8.1-RELEASE i386
>Organization:
Experts Exchange, LLC.
>Environment:
System: FreeBSD eggman.experts-exchange.com 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Mon Jul 19 02:55:53 UTC 2010 root at almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
This patch adds the ability to use cronolog as an optional log processor.
Other can be added as needed.

I also changed the maintainer address. jgh is a alias to jhelfman.

>How-To-Repeat:
	
>Fix:
diff -rduN /usr/ports/www/tomcat55/Makefile tomcat55.my/Makefile
--- tomcat55/Makefile	2010-10-07 14:17:36.000000000 -0700
+++ tomcat55/Makefile	2010-12-09 10:30:54.000000000 -0800
@@ -12,9 +12,11 @@
 MASTER_SITE_SUBDIR=	tomcat/tomcat-5/v${PORTVERSION}/bin
 DISTFILES=	apache-tomcat-${PORTVERSION}.tar.gz
 
-MAINTAINER=	jgh at experts-exchange.com
+MAINTAINER=	jhelfman at experts-exchange.com
 COMMENT=	Open-source Java web server by Apache, 5.5.x branch
 
+OPTIONS=	CRONOLOG "Use Cronolog for Tomcat Log Processing" Off
+
 USE_JAVA=	yes
 JAVA_VERSION?=	1.4+
 JAVA_VENDOR?=	freebsd
@@ -38,7 +40,8 @@
 STDOUT_LOG=	${LOG_DIR}/stdout.log
 STDERR_LOG=	${LOG_DIR}/stderr.log
 PID_FILE=	/var/run/${APP_SHORTNAME}.pid
-REPLACE_FILES=	${WRKSRC}/conf/server.xml
+REPLACE_FILES=	${WRKSRC}/bin/catalina.sh \
+		${WRKSRC}/conf/server.xml
 REPLACE_LIST_TEMP=	${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/}
 JAR_FILE=	bin/bootstrap.jar
 WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
@@ -77,6 +80,18 @@
 PLIST_SUB+=	JAVA14="@comment "
 .endif
 
+.if defined(WITH_CRONOLOG)
+REDIRECT?=     "2\>\&1"
+SUB_LIST+=     LOG_PROCESSOR=${LOG_PROCESSOR} \
+	       LOG_PROCESSOR_DIRECTIVES=${LOG_PROCESSOR_DIRECTIVES} \
+	       LOG_PROCESSOR_OPTS=${LOG_PROCESSOR_OPTS} \
+	       REDIRECT=${REDIRECT}
+RUN_DEPENDS+=	cronolog:${PORTSDIR}/sysutils/cronolog
+LOG_PROCESSOR_DIRECTIVES?= "\$$CATALINA_OUT \$$CATALINA_BASE/logs/catalina.out.\%Y_\%m_\%d.out"
+LOG_PROCESSOR?= ${LOCALBASE}/sbin/cronolog 
+LOG_PROCESSOR_OPTS?= --link
+.endif
+
 pre-patch:
 	@${ECHO_MSG} "Installation settings:"
 	@${ECHO_MSG} "   Destination directory:    ${APP_HOME}"
@@ -90,6 +105,10 @@
 	@${ECHO_MSG} "   Logfile stderr:           ${STDERR_LOG}"
 
 post-patch:
+.if defined(WITH_CRONOLOG)
+	@cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/logprocessor-cronolog
+.endif
+
 	@${ECHO_MSG} -n ">> Removing unneeded files..."
 	@${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.bat' -or -name '*.dll' -or -name '*.exe' -or -name '*.orig' \) -delete
 	@${RMDIR} ${WRKSRC}/bin/[i,x]64
@@ -109,6 +128,7 @@
 
 	@${ECHO_MSG} ">> Copying files to destination directory..."
 	@${CP} ${WRKDIR}/server.xml ${WRKSRC}/conf/
+	@${CP} ${WRKDIR}/catalina.sh ${WRKSRC}/bin/
 	@(cd ${WRKSRC};${FIND} conf -type f | ${SED} -e '/${CONF_EXT}/d') \
 		| while read a; do \
 			${MV} ${WRKSRC}/$$a ${WRKSRC}/$$a.${CONF_EXT}; \
diff -rduN /usr/ports/www/tomcat55/files/logprocessor-cronolog tomcat55.my/files/logprocessor-cronolog
--- /dev/null	1969-12-31 16:00:00.000000000 -0800
+++ tomcat55/files/logprocessor-cronolog	2010-12-08 18:00:40.000000000 -0800
@@ -0,0 +1,74 @@
+--- bin/catalina.sh.orig	2010-09-04 12:53:47.000000000 -0700
++++ bin/catalina.sh	2010-12-08 16:10:30.000000000 -0800
+@@ -245,7 +245,9 @@
+         -Dcatalina.base="$CATALINA_BASE" \
+         -Dcatalina.home="$CATALINA_HOME" \
+         -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+-        org.apache.catalina.startup.Bootstrap "$@" start
++	org.apache.catalina.startup.Bootstrap "$@" start %%REDIRECT%% \
++	| "%%LOG_PROCESSOR%%" "%%LOG_PROCESSOR_OPTS%%" "%%LOG_PROCESSOR_DIRECTIVES%%" &
++
+     else
+       exec "$_RUNJDB" "$LOGGING_CONFIG" $JAVA_OPTS  $CATALINA_OPTS \
+         -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
+@@ -253,7 +255,8 @@
+         -Dcatalina.base="$CATALINA_BASE" \
+         -Dcatalina.home="$CATALINA_HOME" \
+         -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+-        org.apache.catalina.startup.Bootstrap "$@" start
++	org.apache.catalina.startup.Bootstrap "$@" start %%REDIRECT%% \
++	| "%%LOG_PROCESSOR%%" "%%LOG_PROCESSOR_OPTS%%" "%%LOG_PROCESSOR_DIRECTIVES%%" &
+     fi
+   fi
+ 
+@@ -272,14 +275,16 @@
+       -Dcatalina.base="$CATALINA_BASE" \
+       -Dcatalina.home="$CATALINA_HOME" \
+       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+-      org.apache.catalina.startup.Bootstrap "$@" start
++      org.apache.catalina.startup.Bootstrap "$@" start %%REDIRECT%% \
++      | "%%LOG_PROCESSOR%%" "%%LOG_PROCESSOR_OPTS%%" "%%LOG_PROCESSOR_DIRECTIVES%%" &
+   else
+     exec "$_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
++      org.apache.catalina.startup.Bootstrap "$@" start %%REDIRECT%% \
++      | "%%LOG_PROCESSOR%%" "%%LOG_PROCESSOR_OPTS%%" "%%LOG_PROCESSOR_DIRECTIVES%%" &
+   fi
+ 
+ elif [ "$1" = "start" ] ; then
+@@ -298,8 +303,8 @@
+       -Dcatalina.base="$CATALINA_BASE" \
+       -Dcatalina.home="$CATALINA_HOME" \
+       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+-      org.apache.catalina.startup.Bootstrap "$@" start \
+-      >> "$CATALINA_OUT" 2>&1 &
++      org.apache.catalina.startup.Bootstrap "$@" start %%REDIRECT%% \
++      | "%%LOG_PROCESSOR%%" "%%LOG_PROCESSOR_OPTS%%" "%%LOG_PROCESSOR_DIRECTIVES%%" &
+ 
+       if [ ! -z "$CATALINA_PID" ]; then
+         echo $! > $CATALINA_PID
+@@ -310,8 +315,8 @@
+       -Dcatalina.base="$CATALINA_BASE" \
+       -Dcatalina.home="$CATALINA_HOME" \
+       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+-      org.apache.catalina.startup.Bootstrap "$@" start \
+-      >> "$CATALINA_OUT" 2>&1 &
++      org.apache.catalina.startup.Bootstrap "$@" start %%REDIRECT%% \
++      | "%%LOG_PROCESSOR%%" "%%LOG_PROCESSOR_OPTS%%" "%%LOG_PROCESSOR_DIRECTIVES%%" &
+ 
+       if [ ! -z "$CATALINA_PID" ]; then
+         echo $! > $CATALINA_PID
+@@ -332,7 +337,8 @@
+     -Dcatalina.base="$CATALINA_BASE" \
+     -Dcatalina.home="$CATALINA_HOME" \
+     -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+-    org.apache.catalina.startup.Bootstrap "$@" stop
++    org.apache.catalina.startup.Bootstrap "$@" stop %%REDIRECT%% \
++      | "%%LOG_PROCESSOR%%" "%%LOG_PROCESSOR_OPTS%%" "%%LOG_PROCESSOR_DIRECTIVES%%" &
+ 
+   if [ $FORCE -eq 1 ]; then
+     if [ ! -z "$CATALINA_PID" ]; then
>Release-Note:
>Audit-Trail:
>Unformatted: