[pkg-java] r3324 - branches/tomcat5.5/feature/debian/debian

[Marcus Better]

Author: marcusb-guest
Date: 2007-04-24 13:00:33 +0000 (Tue, 24 Apr 2007)
New Revision: 3324

Modified:
   branches/tomcat5.5/feature/debian/debian/changelog
   branches/tomcat5.5/feature/debian/debian/tomcat5.5.init
   branches/tomcat5.5/feature/debian/debian/tomcat5.5.postinst
Log:
Do not create the pipe catalina.out.

Modified: branches/tomcat5.5/feature/debian/debian/changelog
===================================================================
--- branches/tomcat5.5/feature/debian/debian/changelog	2007-04-24 12:45:13 UTC (rev 3323)
+++ branches/tomcat5.5/feature/debian/debian/changelog	2007-04-24 13:00:33 UTC (rev 3324)
@@ -1,3 +1,13 @@
+tomcat5.5 (5.5.20-5) unstable; urgency=low
+
+  * The named pipe "/var/log/tomcat5.5/catalina.out" is no longer
+    created. Messages written to stdout and stderr during daemon startup
+    are now lost. The -debug flag to jsvc may be used for early
+    debugging. A proper solution is planned for future releases. (Closes:
+    #402603)
+
+ -- Marcus Better <marcus at better.se>  Wed, 13 Dec 2006 20:05:48 +0100
+
 tomcat5.5 (5.5.20-4) unstable; urgency=low
 
   * The symlink "/usr/share/tomcat5.5/common/endorsed/xml-apis" is now

Modified: branches/tomcat5.5/feature/debian/debian/tomcat5.5.init
===================================================================
--- branches/tomcat5.5/feature/debian/debian/tomcat5.5.init	2007-04-24 12:45:13 UTC (rev 3323)
+++ branches/tomcat5.5/feature/debian/debian/tomcat5.5.init	2007-04-24 13:00:33 UTC (rev 3324)
@@ -100,7 +100,6 @@
 
 # Define other required variables
 CATALINA_PID="/var/run/$NAME.pid"
-LOGFILE="$CATALINA_BASE/logs/catalina.out"
 BOOTSTRAP_CLASS=org.apache.catalina.startup.Bootstrap
 JSVC_CLASSPATH="/usr/share/java/commons-daemon.jar:$CATALINA_HOME/bin/bootstrap.jar"
 
@@ -147,7 +146,6 @@
 			"$CATALINA_BASE/logs/catalina.out" || true
 
 		$DAEMON -user "$TOMCAT5_USER" -cp "$JSVC_CLASSPATH" \
-		    -outfile "$LOGFILE"  -errfile '&1' \
 		    -pidfile "$CATALINA_PID" $JAVA_OPTS "$BOOTSTRAP_CLASS"
 	else
 	        log_progress_msg "(already running)"

Modified: branches/tomcat5.5/feature/debian/debian/tomcat5.5.postinst
===================================================================
--- branches/tomcat5.5/feature/debian/debian/tomcat5.5.postinst	2007-04-24 12:45:13 UTC (rev 3323)
+++ branches/tomcat5.5/feature/debian/debian/tomcat5.5.postinst	2007-04-24 13:00:33 UTC (rev 3324)
@@ -7,9 +7,6 @@
 		--ingroup nogroup --disabled-password --shell /bin/false \
 		tomcat55
 	fi
-	if [ ! -r /var/log/tomcat5.5/catalina.out ]; then
-	    mkfifo -m600 /var/log/tomcat5.5/catalina.out
-	fi
 	chown -R tomcat55:nogroup /var/log/tomcat5.5 /var/cache/tomcat5.5
 	chown -R tomcat55:adm /var/lib/tomcat5.5/conf
 	chown tomcat55:adm /var/log/tomcat5.5 /var/cache/tomcat5.5