summaryrefslogtreecommitdiff
path: root/contrib/dist
diff options
context:
space:
mode:
authorTomasz Torcz <tomek@pipebreaker.pl>2015-01-09 23:42:16 +0100
committerNick Mathewson <nickm@torproject.org>2015-01-11 11:14:32 -0500
commita8999acc3bca05f1aaa23399c7d5f7a5e51789a4 (patch)
tree9ee5396f4d203b59a37fd9ae902dc98c6511d7a3 /contrib/dist
parent2aa2d0a1c559bcc2f2198ab7df37ab0a33605904 (diff)
downloadtor-a8999acc3bca05f1aaa23399c7d5f7a5e51789a4.tar.gz
tor-a8999acc3bca05f1aaa23399c7d5f7a5e51789a4.zip
fix and enable systemd watchdog
There were following problems: - configure.ac wrongly checked for defined HAVE_SYSTEMD; this wasn't working, so the watchdog code was not compiled in. Replace library search with explicit version check - sd_notify() watchdog call was unsetting NOTIFY_SOCKET from env; this means only first "watchdog ping" was delivered, each subsequent one did not have socket to be sent to and systemd was killing service - after those fixes, enable Watchdog in systemd unit with one minute intervals
Diffstat (limited to 'contrib/dist')
-rw-r--r--contrib/dist/tor.service.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/dist/tor.service.in b/contrib/dist/tor.service.in
index 607615afa2..f50075da6f 100644
--- a/contrib/dist/tor.service.in
+++ b/contrib/dist/tor.service.in
@@ -11,6 +11,7 @@ ExecReload = /bin/kill -HUP ${MAINPID}
KillSignal = SIGINT
TimeoutSec = 30
Restart = on-failure
+WatchdogSec = 1m
LimitNOFILE = 32768
# Hardening