summaryrefslogtreecommitdiffstats
path: root/www/tomcat55/files
diff options
context:
space:
mode:
authorlawrance <lawrance@FreeBSD.org>2006-02-07 13:41:00 +0000
committerlawrance <lawrance@FreeBSD.org>2006-02-07 13:41:00 +0000
commit2fd42dda2551f3bc57797dcae164364f2ffc5f17 (patch)
treefb1ba4566aafbac03a7168cabd21066da30c757c /www/tomcat55/files
parent50104e13900ca3d197f622e781d42dd020472091 (diff)
downloadFreeBSD-ports-2fd42dda2551f3bc57797dcae164364f2ffc5f17.zip
FreeBSD-ports-2fd42dda2551f3bc57797dcae164364f2ffc5f17.tar.gz
Since the procname of tomcat processes may vary due to javavmwrapper,
subvert the 'check_pid_file' procname check by setting it from the output of 'ps'. Remove the previous attempt at handling this problem, which was to put a wildcard in procname. I'll wear my pointy hat for that bogus hack. Reported by: Fritz Heinrichmeyer <Fritz.Heinrichmeyer@FernUni-Hagen.de>
Diffstat (limited to 'www/tomcat55/files')
-rw-r--r--www/tomcat55/files/tomcat55.sh.in9
1 files changed, 8 insertions, 1 deletions
diff --git a/www/tomcat55/files/tomcat55.sh.in b/www/tomcat55/files/tomcat55.sh.in
index dac2e79..105bcae 100644
--- a/www/tomcat55/files/tomcat55.sh.in
+++ b/www/tomcat55/files/tomcat55.sh.in
@@ -105,7 +105,14 @@ java_command="%%LOCALBASE%%/bin/java \
log_args=">> ${tomcat%%TOMCAT_VERSION%%_stdout_log} \
2>> ${tomcat%%TOMCAT_VERSION%%_stderr_log} "
-procname="*java"
+# Subvert the check_pid_file procname check.
+if [ -f $pidfile ]; then
+ read rc_pid junk < $pidfile
+ if [ ! -z "$rc_pid" ]; then
+ procname=`ps -o command= $rc_pid | cut -d ' ' -f 1`
+ fi
+fi
+
required_files="${tomcat%%TOMCAT_VERSION%%_catalina_home}/conf/server.xml"
command="/usr/sbin/daemon"
OpenPOWER on IntegriCloud