mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-20 10:12:15 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nick Mathewson 2015-02-24 11:36:34 -05:00
commit 3e9409ef58
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug14950 Normal file
View File

@ -0,0 +1,3 @@
o Minor features (logs):
- Quiet some log messages in the heartbeat and at startup. Closes
ticket 14950.

13
src/or/main.c
View File

@ -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 (;;) {