diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-02-24 11:11:24 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-02-24 11:11:24 -0500 |
| commit | 783a44f9e98953e3359fd5ccc1788d993808fa64 (patch) | |
| tree | 055fbec9aa4898e4e0b462c65d93a20d2c7ef1d8 | |
| parent | d5aee5e9a5fc2910b0b7cfb8c5fe726ba665178b (diff) | |
| download | tor-783a44f9e98953e3359fd5ccc1788d993808fa64.tar.gz tor-783a44f9e98953e3359fd5ccc1788d993808fa64.zip | |
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.
| -rw-r--r-- | src/or/main.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/or/main.c b/src/or/main.c index 2ef7a7482e..bc89458e87 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -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 (;;) { |