- change service name; fix status

[packages/ApacheJServ.git] / ApacheJServ.init

diff --git a/ApacheJServ.init b/ApacheJServ.init
index 827b221367aa553306bbae9af4a61a17b960024c..0a039b675d2f7c6fada49362f4481878ef6eebb9 100644 (file)
--- a/ApacheJServ.init
+++ b/ApacheJServ.init
@@ -1,10 +1,10 @@
 #!/bin/sh
 #
-# jserv        jserv short service description
+# jserv        standalone ApacheJServ process daemon
 #
 # chkconfig:   345 80 20
 #
-# description: jserv long service description
+# description: jserv ApacheJServ standalone process
 #
 # $Id$
 
@@ -23,14 +23,14 @@ JSERV_CLASS=org.apache.jserv.JServ
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
        if [ ! -f /var/lock/subsys/network ]; then
-               msg_network_down jserv
+               msg_network_down ApacheJServ
                exit 1
        fi
 else
        exit 0
 fi
 
-checkconfig() {
+getconfig() {
        JRE=$(awk -F= '/^wrapper.bin=/{print $2}' $JSERV_PROPERTIES) || JRE=/usr/bin/java
        CLASSPATH=$(awk -F= '/^wrapper\.classpath/{print $2}' $JSERV_PROPERTIES | tr '\n' ':')
        ENV=$(awk -F= '/^wrapper.env=/{printf("%s=%s\n", $2, $3)}' $JSERV_PROPERTIES)
@@ -41,51 +41,50 @@ case "$1" in
   start)
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/jserv ]; then
-               msg_starting jserv
-               checkconfig || exit 1
-               daemon --fork --user jserv env -i $ENV CLASSPATH="$CLASSPATH" $JRE $JSERV_CLASS $JSERV_PROPERTIES
+               msg_starting ApacheJServ
+               getconfig || exit 1
+               start-stop-daemon --start \
+                       --exec /usr/bin/env \
+                       --pidfile /var/run/jserv.pid \
+                       --make-pidfile \
+                       --chuid jserv \
+                       --background \
+                       -- \
+                       -i $ENV CLASSPATH="$CLASSPATH" $JRE $JSERV_CLASS $JSERV_PROPERTIES
                RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/jserv
+               if [ $RETVAL -eq 0 ]; then
+                       touch /var/lock/subsys/jserv
+                       ok
+               else
+                       fail
+               fi
        else
-               msg_already_running jserv
+               msg_already_running ApacheJServ
        fi
        ;;
   stop)
        if [ -f /var/lock/subsys/jserv ]; then
                # Stop daemons.
-               msg_stopping jserv
-               killproc jserv
+               msg_stopping ApacheJServ
+               killproc --pidfile jserv.pid jserv
                rm -f /var/lock/subsys/jserv
        else
-               msg_not_running jserv
+               msg_not_running ApacheJServ
        fi
        ;;
-  restart)
+  restart|reload)
        $0 stop
        $0 start
        exit $?
        ;;
-  reload)
-       if [ -f /var/lock/subsys/jserv ]; then
-               msg_reloading jserv
-               killproc jserv -HUP
-               RETVAL=$?
-       else
-               msg_not_running jserv >&2
-               RETVAL=7
-       fi
-       ;;
   force-reload)
-       # if program allows reloading without stopping
-       $0 reload
-
        # or if it doesn't
        $0 restart
 
        exit $?
        ;;
   status)
-       status jserv
+       status jserv java
        RETVAL=$?
        ;;
   *)