From bea330746cd07ce08f9d5d062924bf2c5195d6ee Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Tue, 18 Oct 2011 13:43:34 +0200 Subject: bugfix: $OMFileFlushInterval period was doubled - now using correct value --- ChangeLog | 1 + runtime/stream.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3ff7cdaf..35de07e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ --------------------------------------------------------------------------- Version 5.8.6 [V5-stable] 2011-??-?? +- bugfix: $OMFileFlushInterval period was doubled - now using correct value - bugfix: ActionQueue could malfunction due to index error Thanks to Vlad Grigorescu for the patch - bugfix: $ActionExecOnlyOnce interval did not work properly diff --git a/runtime/stream.c b/runtime/stream.c index 0238d25e..6b88d3f4 100644 --- a/runtime/stream.c +++ b/runtime/stream.c @@ -1036,7 +1036,7 @@ asyncWriterThread(void *pPtr) continue; /* now we should have data */ } bTimedOut = 0; - timeoutComp(&t, pThis->iFlushInterval * 2000); /* *1000 millisconds */ // TODO: check the 2000?!? + timeoutComp(&t, pThis->iFlushInterval * 1000); /* *1000 millisconds */ if(pThis->bDoTimedWait) { if(pthread_cond_timedwait(&pThis->notEmpty, &pThis->mut, &t) != 0) { int err = errno; -- cgit From b9ca8e0b1e8ce4266ff87bd856f28936518e9404 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 20 Oct 2011 12:05:57 +0200 Subject: doc bug: property pri-text was incorrectly described --- doc/property_replacer.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/property_replacer.html b/doc/property_replacer.html index 4d242a34..6ba149d7 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 pri-text -the PRI part of the message in a textual form (e.g. -"syslog.info") +the PRI part of the message in a textual form with the numerical PRI appended in +brackes (e.g. "local0.err<133>") iut -- cgit From eb87d6f095cc5e72126d8b7716d217a7d6a5e939 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 20 Oct 2011 12:08:03 +0200 Subject: doc bugfix: pri-text neees to be fixed in an article as well --- doc/rsyslog_recording_pri.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/rsyslog_recording_pri.html b/doc/rsyslog_recording_pri.html index cf11e3e5..a092980c 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.

Thankfully, rsyslog provides message properties for the priority. These are called "PRI", "syslogfacility" and "syslogpriority" (case is important!). They are numerical -values. Starting with rsyslog 1.13.4, there is also a property "PRI-text", which -contains the priority in friendly text format (e.g. "syslog.info"). For the rest +values. Starting with rsyslog 1.13.4, there is also a property "pri-text", which +contains the priority in friendly text format (e.g. "local0.err<133>"). For the rest of this article, I assume that you run version 1.13.4 or higher.

Recording the priority is now a simple matter of adding the respective field to the template. It now looks like this:

-$template TraditionalFormatWithPRI,"%PRI-text%: %timegenerated% %HOSTNAME% %syslogtag%%msg:::drop-last-lf%\n" +$template TraditionalFormatWithPRI,"%pri-text%: %timegenerated% %HOSTNAME% %syslogtag%%msg:::drop-last-lf%\n"

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:

-- cgit