summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2016-10-10 23:13:26 +0200
committerGitHub <noreply@github.com>2016-10-10 23:13:26 +0200
commitc637e72b7ac8a6283e7fc3939f089ee59394c08c (patch)
treef11064dc27147052a3db429ec5ab8502aeebd3b5 /src
parentf6dd106c73abb33af5eb0aaeffcddd11724515e6 (diff)
parent6f157e4e4f37a12235ee619970e3776f1fdd1849 (diff)
Merge pull request #4336 from dandedrick/journal-remote-non-blocking
Journal remote non blocking
Diffstat (limited to 'src')
-rw-r--r--src/journal-remote/journal-remote.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
index a9009cfefe..d86c3681b1 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];
}