summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorpoljar (Damir Jelić) <poljarinho@gmail.com>2013-12-03 01:09:56 +0100
committerPeter Meerwald <p.meerwald@bct-electronic.com>2013-12-20 13:06:04 +0100
commitd20ee7e7f21a9deed61ac5adb46cc64921e01796 (patch)
tree86257bc74cca6a0501ad76411f9848fa10b0255a /man
parenta8fea5c468c96b34d62f60062ea260048fd6d36d (diff)
log: Add support for the systemd journal
The journal is a component of systemd, that captures Syslog messages, Kernel log messages, initial RAM disk and early boot messages as well as messages written to STDOUT/STDERR of all services, indexes them and makes this available to the user. It can be used in parallel, or in place of a traditional syslog daemon, such as rsyslog or syslog-ng. The journal offers a couple of improvements over traditional logging facilities (e.g. advanced filtering capabilities). This patch adds support for logging directly to the journal using its native API.
Diffstat (limited to 'man')
-rw-r--r--man/pulse-daemon.conf.5.xml.in11
-rw-r--r--man/pulseaudio.1.xml.in5
2 files changed, 9 insertions, 7 deletions
diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
index c40d5703b..9596738d9 100644
--- a/man/pulse-daemon.conf.5.xml.in
+++ b/man/pulse-daemon.conf.5.xml.in
@@ -297,11 +297,12 @@ USA.
<option>
<p><opt>log-target=</opt> The default log target. Use either
- <opt>stderr</opt>, <opt>syslog</opt>, <opt>auto</opt>,
- <opt>file:PATH</opt> or <opt>newfile:PATH</opt>. <opt>auto</opt> is
- equivalent to <opt>sylog</opt> in case <opt>daemonize</opt> is enabled,
- otherwise to <opt>stderr</opt>. If set to <opt>file:PATH</opt>, logging
- is directed to the file indicated by PATH. <opt>newfile:PATH</opt> is
+ <opt>stderr</opt>, <opt>syslog</opt>, <opt>journal</opt> (optional),
+ <opt>auto</opt>, <opt>file:PATH</opt> or <opt>newfile:PATH</opt>. On traditional
+ systems <opt>auto</opt> is equivalent to <opt>syslog</opt>. On systemd-enabled
+ systems, auto is equivalent to <opt>journal</opt>, in case <opt>daemonize</opt>
+ is enabled, and to <opt>stderr</opt> otherwise. If set to <opt>file:PATH</opt>,
+ logging is directed to the file indicated by PATH. <opt>newfile:PATH</opt> is
otherwise the same as <opt>file:PATH</opt>, but existing files are never
overwritten. If the specified file already exists, a suffix is added to
the file name to avoid overwriting. Defaults to <opt>auto</opt>. The
diff --git a/man/pulseaudio.1.xml.in b/man/pulseaudio.1.xml.in
index d7d745857..114cd967b 100644
--- a/man/pulseaudio.1.xml.in
+++ b/man/pulseaudio.1.xml.in
@@ -217,12 +217,13 @@ USA.
</option>
<option>
- <p><opt>--log-target</opt><arg>={auto,syslog,stderr,file:PATH,newfile:PATH}</arg></p>
+ <p><opt>--log-target</opt><arg>={auto,syslog,journal,stderr,file:PATH,newfile:PATH}</arg></p>
<optdesc><p>Specify the log target. If set to <arg>auto</arg>
(which is the default), then logging is directed to syslog when
<opt>--daemonize</opt> is passed, otherwise to
- STDERR. If set to <arg>file:PATH</arg>, logging is directed to
+ STDERR. If set to <arg>journal</arg> logging is directed to the systemd
+ journal. If set to <arg>file:PATH</arg>, logging is directed to
the file indicated by PATH. <arg>newfile:PATH</arg> is otherwise
the same as file:PATH, but existing files are never overwritten.
If the specified file already exists, a suffix is added to the