nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adjust systemd watchdog support

Browse Source 
Document why we divide it by two.

Check for > 0 instead of nonzero for success, since that's what the
manpage says.

Allow watchdog timers greater than 1 second.
This commit is contained in:
Nick Mathewson 2014-12-23 11:27:16 -05:00
parent 29ac883606
commit 2f46e5e755
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/or/main.c
View File

@ -2045,11 +2045,15 @@ do_main_loop(void)
#ifdef HAVE_SYSTEMD_209
uint64_t watchdog_delay;
/* set up systemd watchdog notification. */
if (sd_watchdog_enabled(1, &watchdog_delay)) {
if (sd_watchdog_enabled(1, &watchdog_delay) > 0) {
if (! systemd_watchdog_timer) {
struct timeval watchdog;
watchdog.tv_sec = 0;
watchdog.tv_usec = watchdog_delay/2;
/* The manager will "act on" us if we don't send them a notification
* every 'watchdog_delay' microseconds. So, send notifications twice
* that often. */
watchdog_delay /= 2;
watchdog.tv_sec = watchdog_delay / 1000000;
watchdog.tv_usec = watchdog_delay % 1000000;
systemd_watchdog_timer = periodic_timer_new(tor_libevent_get_base(),
&watchdog,