summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2005-02-02 06:49:07 +0000
committerPeter Palfrader <peter@palfrader.org>2005-02-02 06:49:07 +0000
commit0133411df97ec2edbc795abe8fd207e92d59b596 (patch)
tree6391f69195c45d59988d33b890f2cf97722b9e1d
parentf575d29a5966689de5e75c05968da4b52ea9de51 (diff)
downloadtor-0133411df97ec2edbc795abe8fd207e92d59b596.tar.gz
tor-0133411df97ec2edbc795abe8fd207e92d59b596.zip
Use SIGINT to shutdown tor
svn:r3504
-rw-r--r--debian/changelog7
-rw-r--r--debian/tor.init4
2 files changed, 8 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index bf77eb6106..74c3678f7e 100644
--- a/debian/changelog
+++ b/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
diff --git a/debian/tor.init b/debian/tor.init
index 93fb375448..bd32a0dd09 100644
--- a/debian/tor.init
+++ b/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."