chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal-remote: tool to receive messages over the network
[elogind.git]
/
src
/
journal
/
journald.c
diff --git
a/src/journal/journald.c
b/src/journal/journald.c
index aa12fa785db9ca82444afb885db6dc8a8395fc64..c8c0801fafe0e7f4fd2a00a57b63e3437b2a395e 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) {
@@
-104,7
+110,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 = sd_event_run(server.event, t);
if (r < 0) {
log_error("Failed to run event loop: %s", strerror(-r));
- r = -errno;
goto finish;
}
goto finish;
}