chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b3de50c
)
journald: make sure the stdout/stderr stream fd is removed from epoll before we close it
author
Lennart Poettering
<lennart@poettering.net>
Wed, 11 Dec 2013 22:36:59 +0000
(23:36 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Wed, 11 Dec 2013 22:36:59 +0000
(23:36 +0100)
src/journal/journald-stream.c
patch
|
blob
|
history
diff --git
a/src/journal/journald-stream.c
b/src/journal/journald-stream.c
index b2291a260f32318716a306ba46314ebc8c628dc2..8958c7f3dec8f1734c124e830b5343fa00d9ce33 100644
(file)
--- 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);