Date: Mon, 14 Mar 2016 15:31:56 +0000 (UTC) From: Mark Felder <feld@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411095 - in head/www/tomcat6: . files Message-ID: <201603141531.u2EFVurh028546@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: feld Date: Mon Mar 14 15:31:56 2016 New Revision: 411095 URL: https://svnweb.freebsd.org/changeset/ports/411095 Log: 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 Modified: head/www/tomcat6/Makefile head/www/tomcat6/files/tomcat6.in Modified: head/www/tomcat6/Makefile ============================================================================== --- head/www/tomcat6/Makefile Mon Mar 14 15:29:52 2016 (r411094) +++ head/www/tomcat6/Makefile Mon Mar 14 15:31:56 2016 (r411095) @@ -3,6 +3,7 @@ PORTNAME= tomcat PORTVERSION= 6.0.45 +PORTREVISION= 1 CATEGORIES= www java MASTER_SITES= APACHE/tomcat/tomcat-6/v${PORTVERSION}/bin DISTNAME= apache-${PORTNAME}-${PORTVERSION} Modified: head/www/tomcat6/files/tomcat6.in ============================================================================== --- head/www/tomcat6/files/tomcat6.in Mon Mar 14 15:29:52 2016 (r411094) +++ head/www/tomcat6/files/tomcat6.in Mon Mar 14 15:31:56 2016 (r411095) @@ -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 }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603141531.u2EFVurh028546>