From: Lennart Poettering <lennart@poettering.net>
Date: Sun, 22 Dec 2013 20:10:06 +0000 (+0100)
Subject: journal: when we shall go down do so cleanly
X-Git-Tag: v209~706
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=565a9388f261c6e459e1726e358284ff687ec941;p=elogind.git

journal: when we shall go down do so cleanly
---

diff --git a/src/journal/journald.c b/src/journal/journald.c
index aa12fa785..37896d050 100644
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -72,6 +72,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) {