X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=contrib%2Fredhat%2Finit.d-collectd;h=829eda5fcdc4d3c553f3c38d8c7a075aa4149c9d;hb=6f05908d1d09ca3e745b8b1d9341d6404aa60136;hp=52bf7433c8a4732b0251ad4a3ee65f3821aa807f;hpb=8a533ce6a4f030b8b5c505b649e232f1354dc24f;p=collectd.git

diff --git a/contrib/redhat/init.d-collectd b/contrib/redhat/init.d-collectd
index 52bf7433..829eda5f 100644
--- a/contrib/redhat/init.d-collectd
+++ b/contrib/redhat/init.d-collectd
@@ -18,16 +18,18 @@ prog="collectdmon"
 service="collectd"
 CONFIG=/etc/collectd.conf
 COLLECTD=/usr/sbin/collectd
-COLLECTDMONPIDIR="/var/run"
-COLLECTDMONPID="$COLLECTDMONPIDIR/collectdmon.pid"
+COLLECTDMONPIDDIR="/var/run"
+COLLECTDMONPID="$COLLECTDMONPIDDIR/collectdmon.pid"
+
+MAXWAIT=30
 
 if [ -r /etc/sysconfig/$service ]; then
 	. /etc/sysconfig/$service
 fi
 
-if [ ! -d $COLLECTDMONPIDIR ]; then
-	mkdir -p $COLLECTDMONPIDIR
-	[ -n "${RUNAS-}" ] && chown $RUNAS: $COLLECTDMONPIDIR
+if [[ ! -d $COLLECTDMONPIDDIR ]]; then
+	mkdir -p $COLLECTDMONPIDDIR
+	[ -n "${RUNAS}" ] && chown "${RUNAS}:" "$COLLECTDMONPIDDIR"
 fi
 
 check_config() {
@@ -40,7 +42,6 @@ check_config() {
         return 0
 }
 
-
 start () {
 	echo -n $"Starting collectd: "
 	check_config
@@ -50,19 +51,34 @@ start () {
 		echo $"not starting due to configuration error"
 		failure $"not starting $service due to configuration error"
 	else
-		daemon --user "${RUNAS-root}" $prog -P $COLLECTDMONPID -c $COLLECTD -- -C "$CONFIG" $ARGS
+		daemon --user "${RUNAS:-root}" $prog -P $COLLECTDMONPID -c $COLLECTD -- -C "$CONFIG" $ARGS
 		RETVAL=$?
 		echo
 		[ $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 || :