- rel 10; properly log stdout/stderr from jsvc; wait up to 360s for tomcat to start

diff --git a/apache-tomcat.init b/apache-tomcat.init
index ec837c0a2d07e663f8bb4b7cb0297e8a95c89b32..83e5a933d5a962a6c28423ec1874d67e2b9f6484 100755 (executable)
--- a/apache-tomcat.init
+++ b/apache-tomcat.init
@@ -66,7 +66,12 @@ start() {
        msg_starting "Tomcat"
        busy
        cd $CATALINA_BASE
-       /usr/bin/jsvc -user tomcat -procname tomcat \
+       /usr/bin/jsvc \
+               -user tomcat \
+               -procname tomcat \
+               -wait 360 \
+               -outfile /var/log/tomcat/catalina.out \
+               -errfile /var/log/tomcat/catalina.out \
                $JSVC_OPTS \
                -Dcatalina.base=${CATALINA_BASE} \
                -Dcatalina.home=${CATALINA_HOME} \
@@ -75,7 +80,7 @@ start() {
                -Djava.util.logging.config.file="${CATALINA_BASE}/conf/logging.properties" \
                -Djava.util.logging.manager="org.apache.juli.ClassLoaderLogManager" \
                $CATALINA_OPTS \
-               org.apache.catalina.startup.Bootstrap >> /var/log/tomcat/catalina.out 2>&1
+               org.apache.catalina.startup.Bootstrap
        [ $? -ne 0 ] && RETVAL=1
        if [ $RETVAL -eq 0 ]; then
                ok
@@ -94,7 +99,7 @@ stop() {
        # Stop daemons.
        msg_stopping "Tomcat"
        busy
-       jsvc -user tomcat -stop \
+       jsvc -user tomcat -stop -wait 360 \
                $JSVC_OPTS \
                org.apache.catalina.startup.Bootstrap
        [ $? -eq 0 ] && ok || fail

diff --git a/tomcat.spec b/tomcat.spec
index a06b5d0982f59120cd876a87ebc73cf65d003a68..f05d8a214603b774a047c034a192fc4342129eb3 100644 (file)
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -13,7 +13,7 @@ Summary:      Web server and Servlet/JSP Engine, RI for Servlet %{servletapiver}/JSP
 Summary(pl.UTF-8):     Serwer www i silnik Servlet/JSP będący wzorcową implementacją API Servlet %{servletapiver}/JSP %{jspapiver}
 Name:          tomcat
 Version:       7.0.41
-Release:       9
+Release:       10
 License:       Apache v2.0
 Group:         Networking/Daemons/Java
 Source0:       http://www.apache.org/dist/tomcat/tomcat-7/v%{version}/src/apache-%{name}-%{version}-src.tar.gz