Log less/better about systemd at startup

Report errors if the notification fails; report success only if it
succeeds; and if we are not notifying systemd because we aren't
running with systemd, don't log at notice.
This commit is contained in:
Nick Mathewson 2015-02-24 11:11:24 -05:00
parent d5aee5e9a5
commit 783a44f9e9

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