Merge pull request #3339 from jkohen/patch-1

[collectd.git] / contrib / redhat / init.d-collectd

diff --git a/contrib/redhat/init.d-collectd b/contrib/redhat/init.d-collectd
index abdb168..829eda5 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
@@ -40,7 +42,6 @@ check_config() {
         return 0
 }
 
-
 start () {
        echo -n $"Starting collectd: "
        check_config
@@ -56,13 +57,28 @@ start () {
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$service
        fi
 }
+
 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
 }
+
+restart () {
+       check_config
+       rc="$?"
+       if test "$rc" -ne 0; then
+               RETVAL=6
+               echo $"not restarting due to configuration error"
+               failure $"not restarting $service due to configuration error"
+       else
+               stop
+               start
+       fi
+}
+
 # See how we were called.
 case "$1" in
   start)
@@ -75,16 +91,7 @@ case "$1" in
        status -p $COLLECTDMONPID $prog
        ;;
   restart|reload)
-       check_config
-       rc="$?"
-       if test "$rc" -ne 0; then
-               RETVAL=6
-               echo $"not restarting due to configuration error"
-               failure $"not restarting $service due to configuration error"
-       else
-               stop
-               start
-       fi
+       restart
        ;;
   condrestart)
        [ -f /var/lock/subsys/$service ] && restart || :