From f9a810bedacf1da7c505c1786a2416d592665926 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 11 Dec 2013 20:13:44 +0100 Subject: journald: port to sd-event and enable watchdog support --- src/journal/journald-native.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/journal/journald-native.c') diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c index 2c91cba16d..5e19fa3f55 100644 --- a/src/journal/journald-native.c +++ b/src/journal/journald-native.c @@ -369,7 +369,6 @@ void server_process_native_file( int server_open_native_socket(Server*s) { union sockaddr_union sa; int one, r; - struct epoll_event ev; assert(s); @@ -420,12 +419,10 @@ int server_open_native_socket(Server*s) { return -errno; } - zero(ev); - ev.events = EPOLLIN; - ev.data.fd = s->native_fd; - if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, s->native_fd, &ev) < 0) { - log_error("Failed to add native server fd to epoll object: %m"); - return -errno; + r = sd_event_add_io(s->event, s->native_fd, EPOLLIN, process_datagram, s, &s->native_event_source); + if (r < 0) { + log_error("Failed to add native server fd to event loop: %s", strerror(-r)); + return r; } return 0; -- cgit v1.2.3-54-g00ecf