X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=contrib%2Fredhat%2Finit.d-collectd;h=4c69f3c9b7e0dd88fc1ac793eca7a7e68b02bb62;hb=dbeee0cfad69e701ea2665001fd9f2bce49c9489;hp=a60acb392e1e25d3a54a93ef59d7a1f6613cac2d;hpb=efa4700ad47969749b0fca622294fd006b2d7cb8;p=collectd.git

diff --git a/contrib/redhat/init.d-collectd b/contrib/redhat/init.d-collectd
index a60acb39..4c69f3c9 100644
--- a/contrib/redhat/init.d-collectd
+++ b/contrib/redhat/init.d-collectd
@@ -18,17 +18,41 @@ prog="collectdmon"
 service="collectd"
 CONFIG=/etc/collectd.conf
 COLLECTD=/usr/sbin/collectd
-COLLECTDMONPID=/var/run/collectdmon.pid
+COLLECTDMONPIDDIR="/var/run"
+COLLECTDMONPID="$COLLECTDMONPIDDIR/collectdmon.pid"
 
-if [ -r /etc/default/$prog ]; then
-	. /etc/default/$prog
+MAXWAIT=30
+
+if [ -r /etc/sysconfig/$service ]; then
+	. /etc/sysconfig/$service
+fi
+
+if [[ ! -d $COLLECTDMONPIDDIR ]]; then
+	mkdir -p $COLLECTDMONPIDDIR
+	[ -n "${RUNAS}" ] && chown "${RUNAS}:" "$COLLECTDMONPIDDIR"
 fi
 
+check_config() {
+        if test ! -r "$CONFIG"; then
+                return 2
+        fi
+        if ! $COLLECTD -t -C "$CONFIG"; then
+                return 1
+        fi
+        return 0
+}
+
+
 start () {
 	echo -n $"Starting collectd: "
-	if [ -r "$CONFIG" ]
-	then
-		daemon $prog -P $COLLECTDMONPID -c $COLLECTD -- -C "$CONFIG"
+	check_config
+	rc="$?"
+	if test "$rc" -ne 0; then
+		RETVAL=6
+		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
 		RETVAL=$?
 		echo
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$service
@@ -36,7 +60,7 @@ start () {
 }
 stop () {
 	echo -n $"Stopping collectd: "
-	killproc $prog
+	killproc -p $COLLECTDMONPID -d $MAXWAIT $prog
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$service
@@ -50,14 +74,22 @@ case "$1" in
 	stop
 	;;
   status)
-	status $prog
+	status -p $COLLECTDMONPID $prog
 	;;
   restart|reload)
-	stop
-	start
+	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
 	;;
   condrestart)
-	[ -f /var/lock/subsys/$prog ] && restart || :
+	[ -f /var/lock/subsys/$service ] && restart || :
 	;;
   *)
 	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"