]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
send more details about daemon status to supervisor
authorTomasz Torcz <tomek@pipebreaker.pl>
Fri, 9 Jan 2015 21:44:00 +0000 (22:44 +0100)
committerNick Mathewson <nickm@torproject.org>
Sun, 11 Jan 2015 16:14:14 +0000 (11:14 -0500)
  If running under systemd, send back information when reloading
configuration and gracefully shutting down.  This gives administator
more information about current Tor daemon state.

src/or/main.c

index 9e5a916b16dce6aa0194acb3e94177d83d9fc1ec..1b439041b99089b62259f6a9df956acf7d0fde77 100644 (file)
@@ -2169,6 +2169,9 @@ process_signal(uintptr_t sig)
         tor_cleanup();
         exit(0);
       }
+#ifdef HAVE_SYSTEMD
+      sd_notify(0, "STOPPING=1");
+#endif
       hibernate_begin_shutdown();
       break;
 #ifdef SIGPIPE
@@ -2188,11 +2191,17 @@ process_signal(uintptr_t sig)
       control_event_signal(sig);
       break;
     case SIGHUP:
+#ifdef HAVE_SYSTEMD
+      sd_notify(0, "RELOADING=1");
+#endif
       if (do_hup() < 0) {
         log_warn(LD_CONFIG,"Restart failed (config error?). Exiting.");
         tor_cleanup();
         exit(1);
       }
+#ifdef HAVE_SYSTEMD
+      sd_notify(0, "READY=1");
+#endif
       control_event_signal(sig);
       break;
 #ifdef SIGCHLD