This commit upstreams the Debian package setting of 60 seconds for TimeoutStopSec, but applies it to startup and shutdown. Part of 28113.
@@ -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.
@@ -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