* try to watch the PID for shutting down citserver

[citadel.git] / citadel / debian / citadel.init

diff --git a/citadel/debian/citadel.init b/citadel/debian/citadel.init
index d821f1f4acc96ddcba425526a4bc14e4a5c80662..6d27f03013ac4471c9ad7ad77096f92a5547d349 100644 (file)
--- a/citadel/debian/citadel.init
+++ b/citadel/debian/citadel.init
@@ -16,8 +16,8 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Citadel Groupware "
 NAME=citserver
 DAEMON=/usr/sbin/$NAME
-PIDFILE=$RUNDIR/$NAME.pid
-DAEMON_ARGS=" -D${PIDFILE} -x3 -lmail -t/dev/null"
+PIDFILE=$RUNDIR/citadel.pid
+DAEMON_ARGS=" -d -x3 -lmail -t/dev/null"
 SCRIPTNAME=/etc/init.d/citadel
 SENDCOMMAND=/usr/sbin/sendcommand
 
@@ -73,11 +73,20 @@ do_stop()
        #   2 if daemon could not be stopped
        #   other if a failure occurred
         if $SENDCOMMAND "DOWN" >/dev/null 2>&1 ; then
+           PID=`cat $PIDFILE`
            rm -f $PIDFILE
-
-           while test -S /var/run/citadel/citadel.socket; do 
+           count=0;
+           while test -S /var/run/citadel/citadel.socket -o -d /proc/$PID; do 
+               count=$(($count+1))
                sleep 1
                echo -n "."
+               if test "$count" = "10"; then
+                   kill $PID
+               fi
+               if test "$count" = "20"; then
+                   kill -9 $PID
+                   rm -rf /var/run/citadel/*
+               fi
            done
                return 0
        else
@@ -90,8 +99,13 @@ do_stop()
 # Function that sends a SIGHUP to the daemon/service
 #
 do_reload() {
-        do_stop
-        do_start
+       # Return
+       #   0 if daemon could not be restarted
+       #   1 if daemon has been restarted
+       #   other if a failure occurred
+        if $SENDCOMMAND "DOWN 1" 2>&1|grep '200 Restarting'>/dev/null ; then
+           return 1
+       fi
        return 0
 }
 
@@ -132,25 +146,18 @@ case "$1" in
            echo "Restarting $DESC" "$NAME"
        fi
 
-       do_stop
+       do_reload
 
        if test -n "$MODERN"; then
            case "$?" in
-               0|1)
-                   do_start
-                   case "$?" in
-                       0) log_end_msg 0 ;;
-                       1) log_end_msg 1 ;; # Old process is still running
-                       *) log_end_msg 1 ;; # Failed to start
-                   esac
+               0)
+                   log_end_msg 0
                    ;;
-               *)
+               1)
                # Failed to stop
                    log_end_msg 1
                    ;;
            esac
-       else
-           do_start
        fi
        ;;
   *)