mirror/tor
0
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 12:22:14 +02:00
Code

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

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

Part of 28113.
This commit is contained in:
teor 2018-11-05 11:23:55 +10:00
parent 0d6d3e1f26
commit bd0e38dcfe
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/ticket28113
View File

@ -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.

2
contrib/dist/tor.service.in vendored
View File

@ -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