Add support for custom wait time and increase the default to 30 seconds.

PR:		ports/168442
Submitted by:	Bruno Ribeiro da Silva <contato@brunoribeiro.org>
This commit is contained in:
Alex Dupre 2012-06-13 11:22:56 +00:00
parent c8837d33f5
commit 37e7803cfd
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=299190
2 changed files with 7 additions and 1 deletions

View file

@ -7,6 +7,7 @@
PORTNAME= tomcat
PORTVERSION= 7.0.27
PORTREVISION= 1
CATEGORIES= www java
MASTER_SITES= ${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR= tomcat/tomcat-7/v${PORTVERSION}/bin

View file

@ -54,6 +54,10 @@
# Set to "" by default.
# Java VM args to use.
#
# tomcat7_wait (int):
# Set to "30" by default.
# Set the wait time (in seconds) for Tomcat process startup
#
# You may symlink this script with other names to run multiple
# instances of tomcat7 with different configurations.
#
@ -89,6 +93,7 @@ eval "_tomcat_logging_manager=\${${name}_logging_manager:-'org.apache.juli.Class
eval "_tomcat_logging_config=\${${name}_logging_config:-'${_tomcat_catalina_base}/conf/logging.properties'}"
eval "_tomcat_classpath=\${${name}_classpath:-''}"
eval "_tomcat_java_opts=\${${name}_java_opts:-''}"
eval "_tomcat_wait=\${${name}_wait:-'30'}"
pidfile="/var/run/${name}.pid"
@ -102,7 +107,7 @@ command_args="-java-home '${_tomcat_java_home}' \
-server \
-user ${_tomcat_catalina_user} \
-pidfile '${pidfile}' \
-wait 10 \
-wait ${_tomcat_wait} \
-outfile '${_tomcat_stdout}' \
-errfile '${_tomcat_stderr}' \
-classpath '%%TOMCAT_HOME%%/bin/bootstrap.jar:%%LOCALBASE%%/share/java/classes/commons-daemon.jar:%%TOMCAT_HOME%%/bin/tomcat-juli.jar${_tomcat_classpath}' \