projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1564 from rpv-tomsk/disk-plugin
[collectd.git]
/
contrib
/
redhat
/
init.d-collectd
diff --git
a/contrib/redhat/init.d-collectd
b/contrib/redhat/init.d-collectd
index
b7c085c
..
829eda5
100644
(file)
--- a/
contrib/redhat/init.d-collectd
+++ b/
contrib/redhat/init.d-collectd
@@
-1,7
+1,7
@@
#!/bin/bash
#
# collectd Startup script for the Collectd statistics gathering daemon
#!/bin/bash
#
# collectd Startup script for the Collectd statistics gathering daemon
-# chkconfig: -
86 15
+# chkconfig: -
99 01
# description: Collectd is a statistics gathering daemon used to collect \
# system information ie. cpu, memory, disk, network
# processname: collectd
# description: Collectd is a statistics gathering daemon used to collect \
# system information ie. cpu, memory, disk, network
# processname: collectd
@@
-15,31
+15,70
@@
RETVAL=0
ARGS=""
prog="collectdmon"
RETVAL=0
ARGS=""
prog="collectdmon"
+service="collectd"
CONFIG=/etc/collectd.conf
COLLECTD=/usr/sbin/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
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: "
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=$?
echo
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$
prog
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$
service
fi
}
fi
}
+
stop () {
echo -n $"Stopping collectd: "
stop () {
echo -n $"Stopping collectd: "
- killproc $prog
+ killproc
-p $COLLECTDMONPID -d $MAXWAIT
$prog
RETVAL=$?
echo
RETVAL=$?
echo
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$
prog
+ [ $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)
# See how we were called.
case "$1" in
start)
@@
-49,14
+88,13
@@
case "$1" in
stop
;;
status)
stop
;;
status)
- status $prog
+ status
-p $COLLECTDMONPID
$prog
;;
restart|reload)
;;
restart|reload)
- stop
- start
+ restart
;;
condrestart)
;;
condrestart)
- [ -f /var/lock/subsys/$
prog
] && restart || :
+ [ -f /var/lock/subsys/$
service
] && restart || :
;;
*)
echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
;;
*)
echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"