[arch-commits] Commit in tomcat6/trunk (tomcat6)

[Guillaume Alaux]

    Date: Sunday, August 21, 2011 @ 13:34:31
  Author: guillaume
Revision: 136024

Fixed erroneous pid retrieval

Modified:
  tomcat6/trunk/tomcat6

---------+
 tomcat6 |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Modified: tomcat6
===================================================================
--- tomcat6	2011-08-21 16:23:28 UTC (rev 136023)
+++ tomcat6	2011-08-21 17:34:31 UTC (rev 136024)
@@ -6,15 +6,11 @@
 . /etc/rc.d/functions
 . /etc/conf.d/${daemon_name}
 
-get_pid() {
-	pidof -o %PPID ${daemon_name}
-}
-
 case "$1" in
   start)
     stat_busy "Starting ${daemon_name} daemon"
 
-    PID=$(get_pid)
+    PID=$(get_pid 'jsvc.exec')
     if [ -z "$PID" ]; then
       [ -f /var/run/${daemon_name}.pid ] && rm -f /var/run/${daemon_name}.pid
       # RUN
@@ -46,7 +42,6 @@
 
   stop)
     stat_busy "Stopping ${daemon_name} daemon"
-    PID=$(get_pid)
     # STOP
     /usr/bin/jsvc \
       -pidfile /var/run/${daemon_name}.pid \