packages: monit/monit.init - don't use daemon for stop and reload since sta...

[gotar]

Author: gotar                        Date: Sun Mar  7 10:36:12 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- don't use daemon for stop and reload since start-stop-daemon --start in use (with RC_LOGGING="no")
- use again monit quit instead of killproc, missing busy/ok/fail messages added, --pidfile added

---- Files affected:
packages/monit:
   monit.init (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: packages/monit/monit.init
diff -u packages/monit/monit.init:1.16 packages/monit/monit.init:1.17
--- packages/monit/monit.init:1.16	Tue Sep  8 12:56:11 2009
+++ packages/monit/monit.init	Sun Mar  7 11:36:07 2010
@@ -27,7 +27,7 @@
 	if [ ! -f /var/lock/subsys/monit ]; then
 		checkconfig
 		msg_starting monit
-		daemon /usr/sbin/monit -c /etc/monitrc -s /var/run/monit.state $OPTIONS
+		daemon --pidfile /var/run/monit.pid /usr/sbin/monit -c /etc/monitrc -s /var/run/monit.state $OPTIONS
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/monit
 	else
@@ -39,7 +39,10 @@
 	# Stop daemons.
 	if [ -f /var/lock/subsys/monit ]; then
 		msg_stopping monit
-		killproc --waitfortime 10 monit
+		busy
+		/usr/sbin/monit -c /etc/monitrc quit
+		RETVAL=$?
+		[ $RETVAL -eq 0 ] && ok || fail
 		rm -f /var/lock/subsys/monit > /dev/null 2>&1
 	else
 		msg_not_running monit
@@ -50,10 +53,10 @@
 # See how we were called.
 case "$1" in
   start)
-  	start
+	start
 	;;
   stop)
-  	stop
+	stop
 	;;
   restart)
 	checkconfig
@@ -64,8 +67,10 @@
 	if [ -f /var/lock/subsys/monit ]; then
 		checkconfig
 		msg_reloading monit
-		daemon /usr/sbin/monit -c /etc/monitrc reload
+		busy
+		/usr/sbin/monit -c /etc/monitrc reload
 		RETVAL=$?
+		[ $RETVAL -eq 0 ] && ok || fail
 	else
 		msg_not_running monit
 		exit 7
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/monit/monit.init?r1=1.16&r2=1.17&f=u