SOURCES: ApacheJServ.init - use functions

[glen]

Author: glen                         Date: Wed Jan 10 16:12:56 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use functions

---- Files affected:
SOURCES:
   ApacheJServ.init (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SOURCES/ApacheJServ.init
diff -u SOURCES/ApacheJServ.init:1.7 SOURCES/ApacheJServ.init:1.8
--- SOURCES/ApacheJServ.init:1.7	Mon Nov 13 11:56:16 2006
+++ SOURCES/ApacheJServ.init	Wed Jan 10 17:12:51 2007
@@ -36,9 +36,7 @@
 	ENV=$(awk -F= '/^wrapper.env=/{printf("%s=%s\n", $2, $3)}' $JSERV_PROPERTIES)
 }
 
-# See how we were called.
-case "$1" in
-  start)
+start() {
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/jserv ]; then
 		msg_starting ApacheJServ
@@ -61,8 +59,9 @@
 	else
 		msg_already_running ApacheJServ
 	fi
-	;;
-  stop)
+}
+
+stop() {
 	if [ -f /var/lock/subsys/jserv ]; then
 		# Stop daemons.
 		msg_stopping ApacheJServ
@@ -71,28 +70,27 @@
 	else
 		msg_not_running ApacheJServ
 	fi
+}
+
+# See how we were called.
+case "$1" in
+  start)
+  	start
 	;;
-  restart|reload)
-	$0 stop
-	$0 start
-	exit $?
+  stop)
+  	stop
 	;;
-  force-reload)
-	# or if it doesn't
-	$0 restart
-
-	exit $?
+  restart)
+	stop
+	start
 	;;
   status)
 	status jserv java
 	RETVAL=$?
 	;;
   *)
-	msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+	msg_usage "$0 {start|stop|restart|status}"
 	exit 3
 esac
 
 exit $RETVAL
-
-# This must be last line !
-# vi:syntax=sh:tw=78:ts=4:sw=4
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/ApacheJServ.init?r1=1.7&r2=1.8&f=u