redhat initscript: add timeout when stopping the daemon

This mitigates the risk of having 2 daemons running simultaneously
during a short period, on restart.

The debian package's initscript does the same thing, using the same
timeout value.

diff --git a/contrib/redhat/init.d-collectd b/contrib/redhat/init.d-collectd
index abdb168f15d28cce78db59ca29589d2ef0a40e5d..4c69f3c9b7e0dd88fc1ac793eca7a7e68b02bb62 100644 (file)
--- a/contrib/redhat/init.d-collectd
+++ b/contrib/redhat/init.d-collectd
@@ -21,6 +21,8 @@ COLLECTD=/usr/sbin/collectd
 COLLECTDMONPIDDIR="/var/run"
 COLLECTDMONPID="$COLLECTDMONPIDDIR/collectdmon.pid"
 
+MAXWAIT=30
+
 if [ -r /etc/sysconfig/$service ]; then
        . /etc/sysconfig/$service
 fi
@@ -58,7 +60,7 @@ start () {
 }
 stop () {
        echo -n $"Stopping collectd: "
-       killproc -p $COLLECTDMONPID $prog
+       killproc -p $COLLECTDMONPID -d $MAXWAIT $prog
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$service