SOURCES: preload.init - use functions

glen glen at pld-linux.org
Mon Oct 2 22:33:03 CEST 2006


Author: glen                         Date: Mon Oct  2 20:33:03 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use functions

---- Files affected:
SOURCES:
   preload.init (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/preload.init
diff -u SOURCES/preload.init:1.3 SOURCES/preload.init:1.4
--- SOURCES/preload.init:1.3	Thu Dec  8 01:28:53 2005
+++ SOURCES/preload.init	Mon Oct  2 22:32:58 2006
@@ -8,20 +8,17 @@
 #
 # $Id$
 
-
 # Source function library
 . /etc/rc.d/init.d/functions
 
 # Get service config - may override defaults
 [ -f /etc/sysconfig/preload ] && . /etc/sysconfig/preload
 
-MIN_MEMORY=${MIN_MEMORY:-256}
-# Check for > MIN_MEMORY MB
-free -m | awk '/Mem:/ {exit ($2 >= ('"$MIN_MEMORY"'))?0:1}' || exit 0
+start() {
+	MIN_MEMORY=${MIN_MEMORY:-256}
+	# Check for > MIN_MEMORY MB
+	free -m | awk '/Mem:/ {exit ($2 >= ('"$MIN_MEMORY"'))?0:1}' || exit 0
 
-# See how we were called.
-case "$1" in
-  start)
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/preload ]; then
 		msg_starting preload
@@ -31,8 +28,9 @@
 	else
 		msg_already_running preload
 	fi
-	;;
-  stop)
+}
+
+stop() {
 	if [ -f /var/lock/subsys/preload ]; then
 		# Stop daemons.
 		msg_stopping preload
@@ -41,26 +39,33 @@
 	else
 		msg_not_running preload
 	fi
-	;;
-  restart)
-	$0 stop
-	$0 start
-	exit $?
-	;;
-  reload)
+}
+
+reload() {
 	if [ -f /var/lock/subsys/preload ]; then
 		msg_reloading preload
 		killproc preload -HUP
 		RETVAL=$?
 	else
-		msg_not_running preload >&2
+		msg_not_running preload
 		RETVAL=7
 	fi
+}
+
+# See how we were called.
+case "$1" in
+  start)
+  	start
+	;;
+  stop)
+  	stop
+	;;
+  restart)
+	stop
+	start
 	;;
-  force-reload)
-	# if program allows reloading without stopping
-	$0 reload
-	exit $?
+  reload|force-reload)
+  	reload
 	;;
   status)
 	status preload
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/preload.init?r1=1.3&r2=1.4&f=u



More information about the pld-cvs-commit mailing list