浏览代码

Use SIGINT to shutdown tor

svn:r3504
Peter Palfrader 20 年之前
父节点
当前提交
0133411df9
共有 2 个文件被更改,包括 8 次插入3 次删除
  1. 6 1
      debian/changelog
  2. 2 2
      debian/tor.init

+ 6 - 1
debian/changelog

@@ -6,8 +6,13 @@ tor (0.1.0.0-alpha-cvs-1) UNRELEASED; urgency=low
   * 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@debian.org>  Wed,  2 Feb 2005 07:19:34 +0100
+ -- Peter Palfrader <weasel@debian.org>  Wed,  2 Feb 2005 07:47:39 +0100
 
 tor (0.0.9.3-1) unstable; urgency=low
 

+ 2 - 2
debian/tor.init

@@ -8,7 +8,7 @@ NAME=tor
 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 @@ case "$1" in
 	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."