From 21c6dc33a6fc0e8617247fc12123bc667dcde92b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 11 Dec 2013 23:36:59 +0100 Subject: [PATCH] journald: make sure the stdout/stderr stream fd is removed from epoll before we close it --- src/journal/journald-stream.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c index b2291a260f3..8958c7f3dec 100644 --- a/src/journal/journald-stream.c +++ b/src/journal/journald-stream.c @@ -334,8 +334,10 @@ void stdout_stream_free(StdoutStream *s) { LIST_REMOVE(stdout_stream, s->server->stdout_streams, s); } - if (s->event_source) + if (s->event_source) { + sd_event_source_set_enabled(s->event_source, SD_EVENT_OFF); s->event_source = sd_event_source_unref(s->event_source); + } if (s->fd >= 0) close_nointr_nofail(s->fd);