X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournald.c;h=886ac92a79c9b0882a1c4bb2e1166660e3b99b4c;hb=5ea846cc5197682d07ee46398996a8c3ccfbcc38;hp=aa12fa785db9ca82444afb885db6dc8a8395fc64;hpb=f9a810bedacf1da7c505c1786a2416d592665926;p=elogind.git

diff --git a/src/journal/journald.c b/src/journal/journald.c
index aa12fa785..886ac92a7 100644
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -37,11 +37,6 @@ int main(int argc, char *argv[]) {
         Server server;
         int r;
 
-        /* if (getppid() != 1) { */
-        /*         log_error("This program should be invoked by init only."); */
-        /*         return EXIT_FAILURE; */
-        /* } */
-
         if (argc > 1) {
                 log_error("This program does not take arguments.");
                 return EXIT_FAILURE;
@@ -62,7 +57,7 @@ int main(int argc, char *argv[]) {
         server_flush_to_var(&server);
         server_flush_dev_kmsg(&server);
 
-        log_debug("systemd-journald running as pid %lu", (unsigned long) getpid());
+        log_debug("systemd-journald running as pid "PID_FMT, getpid());
         server_driver_message(&server, SD_MESSAGE_JOURNAL_START, "Journal started");
 
         sd_notify(false,
@@ -72,6 +67,12 @@ int main(int argc, char *argv[]) {
         for (;;) {
                 usec_t t = (usec_t) -1, n;
 
+                r = sd_event_get_state(server.event);
+                if (r < 0)
+                        goto finish;
+                if (r == SD_EVENT_FINISHED)
+                        break;
+
                 n = now(CLOCK_REALTIME);
 
                 if (server.max_retention_usec > 0 && server.oldest_file_usec > 0) {
@@ -104,7 +105,6 @@ int main(int argc, char *argv[]) {
                 r = sd_event_run(server.event, t);
                 if (r < 0) {
                         log_error("Failed to run event loop: %s", strerror(-r));
-                        r = -errno;
                         goto finish;
                 }
 
@@ -112,7 +112,7 @@ int main(int argc, char *argv[]) {
                 server_maybe_warn_forward_syslog_missed(&server);
         }
 
-        log_debug("systemd-journald stopped as pid %lu", (unsigned long) getpid());
+        log_debug("systemd-journald stopped as pid "PID_FMT, getpid());
         server_driver_message(&server, SD_MESSAGE_JOURNAL_STOP, "Journal stopped");
 
 finish: