From 6203e07a83214a55bb1f88508fcda2005c601dea Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 12 Dec 2013 22:21:25 +0100 Subject: event: rework sd-event exit logic With this change a failing event source handler will not cause the entire event loop to fail. Instead, we just disable the specific event source, log a message at debug level and go on. This also introduces a new concept of "exit code" which can be stored in the event loop and is returned by sd_event_loop(). We also rename "quit" to "exit" everywhere else. Altogether this should make things more robus and keep errors local while still providing a way to return event loop errors in a clear way. --- src/journal/journald-server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/journal') diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 0f67fb8d57..3f8b95dee0 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -1243,7 +1243,7 @@ static int dispatch_sigterm(sd_event_source *es, const struct signalfd_siginfo * log_info("Received SIG%s", signal_to_string(si->ssi_signo)); - sd_event_request_quit(s->event); + sd_event_exit(s->event, 0); return 0; } -- cgit v1.2.3-54-g00ecf