diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-12-11 23:36:59 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-12-11 23:36:59 +0100 |
| commit | 21c6dc33a6fc0e8617247fc12123bc667dcde92b (patch) | |
| tree | 76a132ca6d6d96f06538204b530ef8a93eaad37b /src/journal | |
| parent | b3de50cb07bb49c4e24287002eca1e95c490f90d (diff) | |
journald: make sure the stdout/stderr stream fd is removed from epoll before we close it
Diffstat (limited to 'src/journal')
| -rw-r--r-- | src/journal/journald-stream.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c index b2291a260f..8958c7f3de 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); |