# HG changeset patch # User Pascal Bellard # Date 1250093586 -7200 # Node ID 55bfd8c4ab8541248ea0f0d83c92fb9fd0af1e21 # Parent b7e5667bff3707d01c3a6b15301309800f3c0b4f perdition: ensure pidfile are valid diff -r b7e5667bff37 -r 55bfd8c4ab85 perdition/stuff/etc/init.d/perdition --- a/perdition/stuff/etc/init.d/perdition Wed Aug 12 12:50:40 2009 +0200 +++ b/perdition/stuff/etc/init.d/perdition Wed Aug 12 18:13:06 2009 +0200 @@ -21,7 +21,7 @@ start) for i in $PROTOCOLS; do [ -s /etc/perdition/perdition.$i.conf ] || continue - if [ -f $PIDFILE.$i/perdition.$i.pid ] ; then + if active_pidfile $PIDFILE.$i/perdition.$i.pid perdition.$i ; then echo "$NAME ($i) already running." continue fi @@ -34,7 +34,7 @@ stop) for i in $PROTOCOLS; do [ -s /etc/perdition/perdition.$i.conf ] || continue - if [ ! -f $PIDFILE.$i/perdition.$i.pid ] ; then + if ! active_pidfile $PIDFILE.$i/perdition.$i.pid perdition.$i ; then echo "$NAME ($i) is not running." continue fi @@ -46,7 +46,7 @@ restart) for i in $PROTOCOLS; do [ -s /etc/perdition/perdition.$i.conf ] || continue - if [ ! -f $PIDFILE.$i/perdition.$i.pid ] ; then + if ! active_pidfile $PIDFILE.$i/perdition.$i.pid perdition.$i ; then echo "$NAME ($i) is not running." continue fi @@ -61,7 +61,7 @@ reload) for i in $PROTOCOLS; do [ -s /etc/perdition/perdition.$i.conf ] || continue - [ -f $PIDFILE.$i/perdition.$i.pid ] && \ + active_pidfile $PIDFILE.$i/perdition.$i.pid perdition.$i && \ kill -1 `cat $PIDFILE.$i/perdition.$i.pid` status done