summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-11-11 13:56:54 +0100
committerLennart Poettering <lennart@poettering.net>2015-11-11 14:29:10 +0100
commitdbd6e31cf91ab86a4a2fffeb50ccef211da3126d (patch)
tree9f97ae27e0bf78cbb1b73260e4e88a8f2afc6eee /man
parent94b6551662e0db8eb09768ed70f77759f322b4c6 (diff)
journalctl: make --rotate synchronous, too
Of course, ideally we'd just use normal synchronous bus calls, but this is out of the question as long as we rely on dbus-daemon (which logs to journald, and thus cannot use to avoid cyclic sync loops). Hence, instead, reuse the wait logic already implemented for --sync, and use a signal in one direction, and a mtime watch file for the reply.
Diffstat (limited to 'man')
-rw-r--r--man/journalctl.xml14
1 files changed, 8 insertions, 6 deletions
diff --git a/man/journalctl.xml b/man/journalctl.xml
index 2160f3cba2..b57afb6ebf 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -775,12 +775,12 @@
<varlistentry>
<term><option>--sync</option></term>
- <listitem><para>Ask the journal daemon to write all yet
+ <listitem><para>Asks the journal daemon to write all yet
unwritten journal data to the backing file system and
synchronize all journals. This call does not return until the
- operation is complete. This command guarantees that any log
- messages written before its invocation are safely stored on
- disk at the time it returns.</para></listitem>
+ synchronization operation is complete. This command guarantees
+ that any log messages written before its invocation are safely
+ stored on disk at the time it returns.</para></listitem>
</varlistentry>
<varlistentry>
@@ -803,9 +803,11 @@
<varlistentry>
<term><option>--rotate</option></term>
- <listitem><para>Asks the journal daemon to rotate journal files.
- </para></listitem>
+ <listitem><para>Asks the journal daemon to rotate journal
+ files. This call does not return until the rotation operation
+ is complete.</para></listitem>
</varlistentry>
+
<xi:include href="standard-options.xml" xpointer="help" />
<xi:include href="standard-options.xml" xpointer="version" />
<xi:include href="standard-options.xml" xpointer="no-pager" />