X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Flogger.c;h=64ac21404a5245d508e72d89fe74499a119b630e;hb=2396fb04f78eaa9842c747e384218f0069446960;hp=d4d964d1bbfd440c268d57b4578a0920071e2e0a;hpb=54165a39391980defef3bf3356041aac960f64af;p=elogind.git diff --git a/src/logger.c b/src/logger.c index d4d964d1b..64ac21404 100644 --- a/src/logger.c +++ b/src/logger.c @@ -1,4 +1,4 @@ -/*-*- Mode: C; c-basic-offset: 8 -*-*/ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ /*** This file is part of systemd. @@ -547,8 +547,7 @@ int main(int argc, char *argv[]) { log_set_target(LOG_TARGET_SYSLOG_OR_KMSG); log_parse_environment(); - - log_info("systemd-logger running as pid %lu", (unsigned long) getpid()); + log_open(); if ((n = sd_listen_fds(true)) < 0) { log_error("Failed to read listening file descriptors from environment: %s", strerror(-r)); @@ -563,6 +562,8 @@ int main(int argc, char *argv[]) { if (server_init(&server, (unsigned) n) < 0) return 3; + log_debug("systemd-logger running as pid %lu", (unsigned long) getpid()); + sd_notify(false, "READY=1\n" "STATUS=Processing requests..."); @@ -585,18 +586,19 @@ int main(int argc, char *argv[]) { if (k <= 0) break; - if ((k = process_event(&server, &event)) < 0) + if (process_event(&server, &event) < 0) goto fail; } + r = 0; + log_info("systemd-logger stopped as pid %lu", (unsigned long) getpid()); + fail: sd_notify(false, "STATUS=Shutting down..."); server_done(&server); - log_info("systemd-logger stopped as pid %lu", (unsigned long) getpid()); - return r; }