rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-16 12:10:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v4-stable' into v5-stable

Browse Source
This commit is contained in:
Rainer Gerhards 2010-03-29 15:31:59 +02:00
commit f139dc28fe
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
- bugfix: testbench failed when not executed in UTC+1 timezone
accidently, the time zone information was kept inside some
to-be-checked-for responses
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
Version 5.4.1 [v5-stable] (rgerhards), 2010-03-?? Version 5.4.1 [v5-stable] (rgerhards), 2010-03-??
- added new property replacer option "date-rfc3164-buggyday" primarily - added new property replacer option "date-rfc3164-buggyday" primarily

4
tests/testsuites/parse3.conf
View File

@ -1,8 +1,10 @@
# note: we need to strip off the TZ designator in the rfc3339 timestamp
# as this test otherwise fails in different timezones!
$ModLoad ../plugins/omstdout/.libs/omstdout $ModLoad ../plugins/omstdout/.libs/omstdout
$IncludeConfig nettest.input.conf # This picks the to be tested input from the test driver! $IncludeConfig nettest.input.conf # This picks the to be tested input from the test driver!
$ErrorMessagesToStderr off $ErrorMessagesToStderr off
# use a special format that we can easily parse in expect # use a special format that we can easily parse in expect
$Template output,"%timereported:1:$:date-rfc3339,csv%, %hostname:::csv%, %programname:::csv%, %syslogtag:R,ERE,0,BLANK:[0-9]+--end:csv%, %syslogseverity:::csv%, %msg:::drop-last-lf,csv%\n" $Template output,"%timereported:1:19:date-rfc3339,csv%, %hostname:::csv%, %programname:::csv%, %syslogtag:R,ERE,0,BLANK:[0-9]+--end:csv%, %syslogseverity:::csv%, %msg:::drop-last-lf,csv%\n"
*.* :omstdout:;output *.* :omstdout:;output

4
tests/testsuites/parse_invld_regex.conf
View File

@ -1,8 +1,10 @@
# note: we need to strip off the TZ designator in the rfc3339 timestamp
# as this test otherwise fails in different timezones!
$ModLoad ../plugins/omstdout/.libs/omstdout $ModLoad ../plugins/omstdout/.libs/omstdout
$IncludeConfig nettest.input.conf # This picks the to be tested input from the test driver! $IncludeConfig nettest.input.conf # This picks the to be tested input from the test driver!
$ErrorMessagesToStderr off $ErrorMessagesToStderr off
# use a special format that we can easily parse in expect # use a special format that we can easily parse in expect
$Template output,"%timereported:1:$:date-rfc3339,csv%, %hostname:::csv%, %programname:::csv%, %syslogtag:R,ERE,0,BLANK:[0-9+--end:csv%, %syslogseverity:::csv%, %msg:::drop-last-lf,csv%\n" $Template output,"%timereported:1:19:date-rfc3339,csv%, %hostname:::csv%, %programname:::csv%, %syslogtag:R,ERE,0,BLANK:[0-9+--end:csv%, %syslogseverity:::csv%, %msg:::drop-last-lf,csv%\n"
*.* :omstdout:;output *.* :omstdout:;output

4
tests/testsuites/reallife.parse3
View File

@ -9,7 +9,7 @@
# documentation by IANA. # documentation by IANA.
# rgerhards, 2009-10-19 # rgerhards, 2009-10-19
<175>Oct 16 2009 23:47:31 hostname tag This is a message <175>Oct 16 2009 23:47:31 hostname tag This is a message
"2009-10-16T23:47:31+01:00", "hostname", "tag", "", "7", " This is a message" "2009-10-16T23:47:31", "hostname", "tag", "", "7", " This is a message"
# #
<175>Oct 16 2009 23:47:31 hostname tag[1234] This is a message <175>Oct 16 2009 23:47:31 hostname tag[1234] This is a message
"2009-10-16T23:47:31+01:00", "hostname", "tag", "1234", "7", " This is a message" "2009-10-16T23:47:31", "hostname", "tag", "1234", "7", " This is a message"

2
tests/testsuites/samples.parse_invld_regex
View File

@ -13,4 +13,4 @@
# configured format. # configured format.
# rgerhards, 2010-02-08 # rgerhards, 2010-02-08
<175>Feb 08 2008 23:47:31 hostname tag This is a message <175>Feb 08 2008 23:47:31 hostname tag This is a message
"2008-02-08T23:47:31+01:00", "hostname", "tag", **NO MATCH** **BAD REGULAR EXPRESSION**, "7", " This is a message" "2008-02-08T23:47:31", "hostname", "tag", **NO MATCH** **BAD REGULAR EXPRESSION**, "7", " This is a message"