From: Dan Dedrick <ddedrick@lexmark.com>
Date: Wed, 4 May 2016 21:06:45 +0000 (-0400)
Subject: journal-remote: make the child pipe non-blocking
X-Git-Tag: v232~121^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=800d3f3478b3dfd546344a4b8f5cc09860bd7da5;p=thirdparty%2Fsystemd.git

journal-remote: make the child pipe non-blocking

We are going to add this child as a source to our event loop so we don't
want to block when reading data from it as this will prevent us from
processing other events. Specifically this will block the signalfds
which means if we are waiting for data from curl we won't handle SIGTERM
or SIGINT until we happen to get more data.
---

diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
index a9009cfefeb..d86c3681b19 100644
--- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
@@ -127,6 +127,10 @@ static int spawn_child(const char* child, char** argv) {
         if (r < 0)
                 log_warning_errno(errno, "Failed to close write end of pipe: %m");
 
+        r = fd_nonblock(fd[0], true);
+        if (r < 0)
+                log_warning_errno(errno, "Failed to set child pipe to non-blocking: %m");
+
         return fd[0];
 }