diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-10-10 23:13:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-10 23:13:26 +0200 |
| commit | c637e72b7ac8a6283e7fc3939f089ee59394c08c (patch) | |
| tree | f11064dc27147052a3db429ec5ab8502aeebd3b5 | |
| parent | f6dd106c73abb33af5eb0aaeffcddd11724515e6 (diff) | |
| parent | 6f157e4e4f37a12235ee619970e3776f1fdd1849 (diff) | |
Merge pull request #4336 from dandedrick/journal-remote-non-blocking
Journal remote non blocking
| -rw-r--r-- | man/systemd-journal-remote.xml | 17 | ||||
| -rw-r--r-- | src/journal-remote/journal-remote.c | 4 |
2 files changed, 12 insertions, 9 deletions
diff --git a/man/systemd-journal-remote.xml b/man/systemd-journal-remote.xml index f208f8deb4..ee2d5c2486 100644 --- a/man/systemd-journal-remote.xml +++ b/man/systemd-journal-remote.xml @@ -250,20 +250,19 @@ </varlistentry> <varlistentry> - <term><option>--compress</option></term> - <term><option>--no-compress</option></term> + <term><option>--compress</option> [<replaceable>BOOL</replaceable>]</term> - <listitem><para>Compress or not, respectively, the data in the - journal using XZ.</para></listitem> + <listitem><para>If this is set to <literal>yes</literal> then compress + the data in the journal using XZ. The default is <literal>yes</literal>. + </para></listitem> </varlistentry> <varlistentry> - <term><option>--seal</option></term> - <term><option>--no-seal</option></term> + <term><option>--seal</option> [<replaceable>BOOL</replaceable>]</term> - <listitem><para>Periodically sign or not, respectively, the - data in the journal using Forward Secure Sealing. - </para></listitem> + <listitem><para>If this is set to <literal>yes</literal> then + periodically sign the data in the journal using Forward Secure Sealing. + The default is <literal>no</literal>.</para></listitem> </varlistentry> <varlistentry> 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]; } |