Commit 3e9409ef authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge remote-tracking branch 'origin/maint-0.2.6'

parents e49d63a7 783a44f9

changes/bug14950

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor features (logs):

    - Quiet some log messages in the heartbeat and at startup. Closes

      ticket 14950.
 
 No newline at end of file

src/or/main.c

+11 −2
Original line number Diff line number Diff line
@@ -2071,8 +2071,17 @@ do_main_loop(void) 
#endif



#ifdef HAVE_SYSTEMD

  log_notice(LD_GENERAL, "Signaling readiness to systemd");

  sd_notify(0, "READY=1");

  {

    const int r = sd_notify(0, "READY=1");

    if (r < 0) {

      log_warn(LD_GENERAL, "Unable to send readiness to systemd: %s",

               strerror(r));

    } else if (r > 0) {

      log_notice(LD_GENERAL, "Signaled readiness to systemd");

    } else {

      log_info(LD_GENERAL, "Systemd NOTIFY_SOCKET not present.");

    }

  }

#endif



  for (;;) {