- rel 2

[packages/ApacheJServ.git] / ApacheJServ.init

diff --git a/ApacheJServ.init b/ApacheJServ.init
index 0a039b675d2f7c6fada49362f4481878ef6eebb9..0044ebe0d8af263ea01972f55a4916d755e726c5 100644 (file)
--- a/ApacheJServ.init
+++ b/ApacheJServ.init
@@ -36,21 +36,19 @@ getconfig() {
        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
                getconfig || exit 1
-               start-stop-daemon --start \
+               /usr/bin/setsid 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
+                       -i $ENV PATH="$PATH" CLASSPATH="$CLASSPATH" LOGFILE=/var/log/jserv/stdout.log /usr/sbin/runjserv $JRE $JSERV_CLASS $JSERV_PROPERTIES
                RETVAL=$?
                if [ $RETVAL -eq 0 ]; then
                        touch /var/lock/subsys/jserv
@@ -61,8 +59,9 @@ case "$1" in
        else
                msg_already_running ApacheJServ
        fi
-       ;;
-  stop)
+}
+
+stop() {
        if [ -f /var/lock/subsys/jserv ]; then
                # Stop daemons.
                msg_stopping ApacheJServ
@@ -71,28 +70,27 @@ case "$1" in
        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