shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-25 23:21:33 +03:00
Code

Merge pull request #4336 from dandedrick/journal-remote-non-blocking

Browse Source 
Journal remote non blocking
This commit is contained in:
Martin Pitt 2016-10-10 23:13:26 +02:00 committed by GitHub
commit c637e72b7a
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
man/systemd-journal-remote.xml
View File

@ -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>

4
src/journal-remote/journal-remote.c
View File

@ -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];
}