chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9bf3b53
)
journal: when we shall go down do so cleanly
author
Lennart Poettering
<lennart@poettering.net>
Sun, 22 Dec 2013 20:10:06 +0000
(21:10 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Sun, 22 Dec 2013 20:12:25 +0000
(21:12 +0100)
src/journal/journald.c
patch
|
blob
|
history
diff --git
a/src/journal/journald.c
b/src/journal/journald.c
index aa12fa785db9ca82444afb885db6dc8a8395fc64..37896d050da93c3c174007e029055d97707cb4df 100644
(file)
--- 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;
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) {
n = now(CLOCK_REALTIME);
if (server.max_retention_usec > 0 && server.oldest_file_usec > 0) {