tor

commit bd0e38dcfeb63303af83069e4e1e4c70982c56d7
parent 0d6d3e1f265609e8e74bf970a5d578300c465617
Author: teor <teor@torproject.org>
Date:   Mon,  5 Nov 2018 11:23:55 +1000

systemd: allow tor some time to shut down after ShutdownWaitLength expires

This commit upstreams the Debian package setting of 60 seconds for
TimeoutStopSec, but applies it to startup and shutdown.

Part of 28113.

Diffstat:
M
changes/ticket28113
 | 
4
+++-
M
contrib/dist/tor.service.in
 | 
2
+-

2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/changes/ticket28113 b/changes/ticket28113
@@ -1,3 +1,5 @@
   o Minor bugfixes (relay shutdown, systemd):
     - Notify systemd of ShutdownWaitLength so it can be set to longer than
-      systemd's TimeoutStopSec. Fixes bug 28113; bugfix on 0.2.6.2-alpha.
+      systemd's TimeoutStopSec. In tor's systemd service file, set
+      TimeoutSec to 60 seconds, to allow tor some time to shut down.
+      Fixes bug 28113; bugfix on 0.2.6.2-alpha.
diff --git a/contrib/dist/tor.service.in b/contrib/dist/tor.service.in
@@ -15,7 +15,7 @@ ExecStartPre=@BINDIR@/tor -f @CONFDIR@/torrc --verify-config
 ExecStart=@BINDIR@/tor -f @CONFDIR@/torrc
 ExecReload=/bin/kill -HUP ${MAINPID}
 KillSignal=SIGINT
-TimeoutSec=30
+TimeoutSec=60
 Restart=on-failure
 WatchdogSec=1m
 LimitNOFILE=32768