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: implement parallel traversal in client
[elogind.git]
/
src
/
journal
/
journald.c
diff --git
a/src/journal/journald.c
b/src/journal/journald.c
index e9ac3a832e7b19d93037c0d74b314d22d2fa14d8..d65451df581913267c44e256986252dca4de7c85 100644
(file)
--- a/
src/journal/journald.c
+++ b/
src/journal/journald.c
@@
-29,7
+29,7
@@
#include <acl/libacl.h>
#include "hashmap.h"
#include <acl/libacl.h>
#include "hashmap.h"
-#include "journal-
privat
e.h"
+#include "journal-
fil
e.h"
#include "sd-daemon.h"
#include "socket-util.h"
#include "acl-util.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;
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;
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);
}
process_message(s, strstrip(buf), ucred, tv);
}
+
+ return 1;
}
}
- return 1;
+ log_error("Unknown event.");
+ return 0;
}
static int server_init(Server *s) {
}
static int server_init(Server *s) {