diff options
author | Mark Felder <feld@FreeBSD.org> | 2016-03-14 15:31:56 +0000 |
---|---|---|
committer | Mark Felder <feld@FreeBSD.org> | 2016-03-14 15:31:56 +0000 |
commit | eefe55b85bad325adad7d983e67cd4a8cd79eb4f (patch) | |
tree | 7f1d8420f5f7931d29b3b05c8506cdacb6c74363 /www/tomcat6/files/tomcat6.in | |
parent | Update devel/awscli to 1.10.11, devel/py-botocore to 1.4.2. (diff) |
www/tomcat6: Make rc script more reliable
By using procstat instead of jps to check if the daemon is running we
avoid deadlocks if the java process is hung.
PR: 206853
Notes
Notes:
svn path=/head/; revision=411095
Diffstat (limited to 'www/tomcat6/files/tomcat6.in')
-rw-r--r-- | www/tomcat6/files/tomcat6.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/www/tomcat6/files/tomcat6.in b/www/tomcat6/files/tomcat6.in index 8c5edf09b622..5183ef2cd5af 100644 --- a/www/tomcat6/files/tomcat6.in +++ b/www/tomcat6/files/tomcat6.in @@ -168,7 +168,7 @@ tomcat_check_pidfile() { debug "pid file ($_pidfile): no pid in file." return fi - if [ -n "`%%LOCALBASE%%/bin/jps -l | grep -e "^$_pid $java_class\$"`" ]; then + if [ -n "`/usr/bin/procstat -c $_pid | grep -e "^$_pid.*$java_class"`" ]; then echo -n $_pid fi } |