[or-cvs] Use SIGINT to shutdown tor

[weasel@xxxxxxxx (Peter Palfrader)]

Update of /home/or/cvsroot/tor/debian
In directory moria.mit.edu:/tmp/cvs-serv23525

Modified Files:
	changelog tor.init 
Log Message:
Use SIGINT to shutdown tor

Index: changelog
===================================================================
RCS file: /home/or/cvsroot/tor/debian/changelog,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- changelog	2 Feb 2005 06:20:38 -0000	1.94
+++ changelog	2 Feb 2005 06:49:07 -0000	1.95
@@ -6,8 +6,13 @@
   * Update URL to tor in debian/control and debian/copyright.
   * Set ulimit for file descriptors to 4096 in our init
     script.
+  * Use SIGINT to shutdown tor.  That way - if you are a server -
+    tor will stop accepting new connections immediately, and
+    give existing connections a grace period of 30 seconds in
+    which they might complete their task.  If you just run a
+    client it should make no difference.
 
- -- Peter Palfrader <weasel@xxxxxxxxxx>  Wed,  2 Feb 2005 07:19:34 +0100
+ -- Peter Palfrader <weasel@xxxxxxxxxx>  Wed,  2 Feb 2005 07:47:39 +0100
 
 tor (0.0.9.3-1) unstable; urgency=low
 

Index: tor.init
===================================================================
RCS file: /home/or/cvsroot/tor/debian/tor.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- tor.init	2 Feb 2005 06:20:38 -0000	1.10
+++ tor.init	2 Feb 2005 06:49:07 -0000	1.11
@@ -8,7 +8,7 @@
 DESC="tor daemon"
 TORPID=/var/run/tor/tor.pid
 DEFAULTSFILE=/etc/default/$NAME
-WAITFORDAEMON=10
+WAITFORDAEMON=35
 ARGS=""
 MAX_FILEDESCRIPTORS=4096
 
@@ -64,7 +64,7 @@
 	if test ! -f $TORPID -o -z "$pid"
 	then
 		echo "not running (there is no $TORPID)."
-	elif start-stop-daemon --stop --quiet --pidfile $TORPID --exec $DAEMON
+	elif start-stop-daemon --stop --signal INT --quiet --pidfile $TORPID --exec $DAEMON
 	then
 		wait_for_deaddaemon $pid
 		echo "$NAME."