summaryrefslogtreecommitdiff
path: root/src/journal/journald.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/journal/journald.c')
-rw-r--r--src/journal/journald.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/journal/journald.c b/src/journal/journald.c
index e9ac3a832e..d65451df58 100644
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -29,7 +29,7 @@
#include <acl/libacl.h>
#include "hashmap.h"
-#include "journal-private.h"
+#include "journal-file.h"
#include "sd-daemon.h"
#include "socket-util.h"
#include "acl-util.h"
@@ -282,7 +282,9 @@ static int process_event(Server *s, struct epoll_event *ev) {
log_debug("Received SIG%s", signal_to_string(sfsi.ssi_signo));
return 0;
- } else {
+ }
+
+ if (ev->data.fd == s->syslog_fd) {
for (;;) {
char buf[LINE_MAX+1];
struct msghdr msghdr;
@@ -339,9 +341,12 @@ static int process_event(Server *s, struct epoll_event *ev) {
process_message(s, strstrip(buf), ucred, tv);
}
+
+ return 1;
}
- return 1;
+ log_error("Unknown event.");
+ return 0;
}
static int server_init(Server *s) {