Author: glen Date: Mon Feb 20 17:42:05 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- more pldize
---- Files affected:
SOURCES:
rbldnsd.init (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/rbldnsd.init
diff -u SOURCES/rbldnsd.init:1.2 SOURCES/rbldnsd.init:1.3
--- SOURCES/rbldnsd.init:1.2 Mon Feb 20 16:59:43 2006
+++ SOURCES/rbldnsd.init Mon Feb 20 18:42:00 2006
@@ -23,9 +23,6 @@
NAME=rbldnsd
DESC=rbldnsd
-
-set -e
-
RBLDNSD=
if [ -f /etc/sysconfig/rbldnsd ]; then
@@ -37,65 +34,88 @@
test -n "$RBLDNSD" || exit 0
forall() {
- echo "$RBLDNSD" |
- while read name args; do
- case "$name" in
- ""|\#*) continue;;
- -) name=$NAME; pidfile=/var/run/$name.pid;;
- *) pidfile=/var/run/rbldnsd-$name.pid;;
- esac
- pid=
- if [ -f $pidfile ]; then
- read p < $pidfile
- if [ -n "$p" -a -f /proc/$p/cmdline ]; then
- case "`cat /proc/$p/cmdline 2>/dev/null`" in
- *$NAME*) pid=$p;;
- esac
- fi
- fi
- $1
- done
+ echo "$RBLDNSD" |
+ while read name args; do
+ case "$name" in
+ ""|\#*)
+ continue
+ ;;
+ -)
+ name=$NAME; pidfile=/var/run/$name.pid
+ ;;
+ *)
+ pidfile=/var/run/rbldnsd-$name.pid;;
+ esac
+
+ pid=
+ if [ -f $pidfile ]; then
+ read p < $pidfile
+ if [ -n "$p" -a -f /proc/$p/cmdline ]; then
+ case "`cat /proc/$p/cmdline 2>/dev/null`" in
+ *$NAME*)
+ pid=$p
+ ;;
+ esac
+ fi
+ fi
+ # call subroutine
+ $1
+ done
}
report() {
- echo "$1 $DESC: $name"
+ echo "$1 $DESC: $name"
}
runit() {
- /usr/sbin/rbldnsd -p $pidfile $args
+ /usr/sbin/rbldnsd -q -p $pidfile $args
}
start() {
- if [ ! "$pid" ]; then
- report Starting
- runit
- fi
+ if [ ! "$pid" ]; then
+ msg_starting $name
+ runit
+ RETVAL=$?
+ [ "$RETVAL" = 0 ] && ok || fail
+ else
+ msg_already_running $name
+ fi
}
stop() {
- if [ "$pid" ]; then
- report Stopping
- kill $pid
- rm -f $pidfile
- fi
+ if [ "$pid" ]; then
+ msg_stopping $name
+ kill $pid
+ rm -f $pidfile
+ RETVAL=$?
+ [ "$RETVAL" = 0 ] && ok || fail
+ else
+ msg_not_running $name
+ fi
}
restart() {
- if [ "$pid" ]; then
- report Restarting
- kill $pid
- sleep 1
- runit
- else
- start
- fi
+ if [ "$pid" ]; then
+ msg_stopping $name
+ kill $pid
+ [ "$RETVAL" = 0 ] && ok || fail
+ RETVAL=$?
+ msg_starting $name
+ runit
+ [ "$RETVAL" != 0 ] && RETVAL=$?
+ [ "$RETVAL" = 0 ] && ok || fail
+ else
+ start
+ fi
}
reload() {
- if [ "$pid" ]; then
- report Reloading
- kill -HUP $pid
- fi
+ if [ "$pid" ]; then
+ msg_reloading $name
+ kill -HUP $pid
+ RETVAL=$?
+ [ "$RETVAL" = 0 ] && ok || fail
+ fi
}
RETVAL=0
@@ -111,6 +131,10 @@
;;
reload|force-reload)
forall reload
+ ;;
+status)
+ status rbldnsd
+ RETVAL=$?
;;
*)
msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/rbldnsd.init?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
