summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-10-21 11:42:24 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-10-21 11:42:24 +0200
commit5cf2c696680a90a23fabdd8761cdc7d0a3221e6a (patch)
tree99fd731614e03d9865dfee9f5f54405e34b8d2a3
parentce315e5da3b33b107633adad0bcc0fd5fc26d198 (diff)
parent599a493cac7b067d34cba549c60f2d5bea9333b8 (diff)
downloadrsyslog-5cf2c696680a90a23fabdd8761cdc7d0a3221e6a.zip
rsyslog-5cf2c696680a90a23fabdd8761cdc7d0a3221e6a.tar.gz
rsyslog-5cf2c696680a90a23fabdd8761cdc7d0a3221e6a.tar.xz
Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stable
-rw-r--r--doc/property_replacer.html4
-rw-r--r--doc/rsyslog_recording_pri.html6
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/property_replacer.html b/doc/property_replacer.html
index cd357f6..f0153f2 100644
--- a/doc/property_replacer.html
+++ b/doc/property_replacer.html
@@ -65,8 +65,8 @@ BSD syslogd. For example, when TAG is "named[12345]", programname is
</tr>
<tr>
<td><b>pri-text</b></td>
-<td>the PRI part of the message in a textual form (e.g.
-"syslog.info")</td>
+<td>the PRI part of the message in a textual form with the numerical PRI appended in
+brackes (e.g. "local0.err<133>")</td>
</tr>
<tr>
<td><b>iut</b></td>
diff --git a/doc/rsyslog_recording_pri.html b/doc/rsyslog_recording_pri.html
index cf11e3e..a092980 100644
--- a/doc/rsyslog_recording_pri.html
+++ b/doc/rsyslog_recording_pri.html
@@ -44,13 +44,13 @@ from the syslog message when output is written. Everything outside of the
percent signs is literal text, which is simply written as specified.</p>
<p>Thankfully, rsyslog provides message properties for the priority. These are
called &quot;PRI&quot;, &quot;syslogfacility&quot; and &quot;syslogpriority&quot; (case is important!). They are numerical
-values. Starting with rsyslog 1.13.4, there is also a property &quot;PRI-text&quot;, which
-contains the priority in friendly text format (e.g. &quot;syslog.info&quot;). For the rest
+values. Starting with rsyslog 1.13.4, there is also a property &quot;pri-text&quot;, which
+contains the priority in friendly text format (e.g. &quot;local0.err<133>&quot;). For the rest
of this article, I assume that you run version 1.13.4 or higher.</p>
<p>Recording the priority is now a simple matter of adding the respective field
to the template. It now looks like this:</p>
<p align="center">
-<code>$template TraditionalFormatWithPRI,&quot;%PRI-text%: %timegenerated% %HOSTNAME% %syslogtag%%msg:::drop-last-lf%\n&quot;</code>
+<code>$template TraditionalFormatWithPRI,&quot;%pri-text%: %timegenerated% %HOSTNAME% %syslogtag%%msg:::drop-last-lf%\n&quot;</code>
</p>
<p>Now we have the right template - but how to write it to a file? You probably
have a line like this in your syslog.conf:</p>