From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 11 Dec 2013 22:36:59 +0000 (+0100)
Subject: journald: make sure the stdout/stderr stream fd is removed from epoll before we close it
X-Git-Tag: v209~1019
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=21c6dc33a6fc0e8617247fc12123bc667dcde92b;p=elogind.git

journald: make sure the stdout/stderr stream fd is removed from epoll before we close it
---

diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
index b2291a260..8958c7f3d 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);