From: Wilfried Göesgens <willi@citadel.org>
Date: Wed, 7 Nov 2007 18:11:45 +0000 (+0000)
Subject: * if citadel doesn't come down by sendcommand in 10 seconds, send it a TERM, after... 
X-Git-Tag: v7.86~2822
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=3792f4af2dc138f1f70c654129ddcdb8c71a7d46

* if citadel doesn't come down by sendcommand in 10 seconds, send it a TERM, after another 10 seconds be rude and send it KILL
---

diff --git a/citadel/debian/citadel.init b/citadel/debian/citadel.init
index 37f98d4c3..20f948881 100644
--- a/citadel/debian/citadel.init
+++ b/citadel/debian/citadel.init
@@ -74,10 +74,18 @@ do_stop()
 	#   other if a failure occurred
         if $SENDCOMMAND "DOWN" >/dev/null 2>&1 ; then
 	    rm -f $PIDFILE
-
+	    count=1;
 	    while test -S /var/run/citadel/citadel.socket; do 
+		count=$(($count+1))
 		sleep 1
 		echo -n "."
+		if test "$count" == "10"; then
+		    killall citserver
+		fi
+		if test "$count" == "20"; then
+		    killall -9 citserver
+		    rm -rf /var/run/citadel/*
+		fi
 	    done
 		return 0
 	else