SOURCES: nagios-nsca.init - use functions

glen glen at pld-linux.org
Wed Dec 20 01:26:03 CET 2006


Author: glen                         Date: Wed Dec 20 00:26:03 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use functions

---- Files affected:
SOURCES:
   nagios-nsca.init (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/nagios-nsca.init
diff -u SOURCES/nagios-nsca.init:1.5 SOURCES/nagios-nsca.init:1.6
--- SOURCES/nagios-nsca.init:1.5	Tue Aug 29 13:37:25 2006
+++ SOURCES/nagios-nsca.init	Wed Dec 20 01:25:57 2006
@@ -28,10 +28,7 @@
 	exit 0
 fi
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
+start() {
 	# Check if the service is already running?
 	if [ -f /var/lock/subsys/nagios-nsca ]; then
 		msg_already_running "Nagios NSCA daemon"
@@ -41,8 +38,9 @@
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/nagios-nsca
 	fi
-	;;
-  stop)
+}
+
+stop() {
 	if [ -f /var/lock/subsys/nagios-nsca ]; then
 		msg_stopping "Nagios NSCA daemon"
 		killproc nsca
@@ -50,11 +48,20 @@
 	else
 		msg_not_running "Nagios NSCA daemon"
 	fi
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+  	start
+	;;
+  stop)
+  	stop
 	;;
   restart|force-reload)
-	$0 stop
-	$0 start
-	exit $?
+	stop
+	start
 	;;
   status)
 	status nsca
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/nagios-nsca.init?r1=1.5&r2=1.6&f=u



More information about the pld-cvs-commit mailing list