From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 23 Dec 2014 16:27:16 +0000 (-0500)
Subject: Adjust systemd watchdog support
X-Git-Tag: tor-0.2.6.2-alpha~26^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2f46e5e7558ca3b7dab16fb970d16c1a3dfd190c;p=thirdparty%2Ftor.git

Adjust systemd watchdog support

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

diff --git a/src/or/main.c b/src/or/main.c
index 5a17212da6..58e3ad3e4d 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -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,