summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v4-stable-solaris' into master-solarisRainer Gerhards2010-03-021-0/+1
|\
| * added include needed for SolarisRainer Gerhards2010-03-021-0/+1
| |
* | Merge branch 'beta' into masterRainer Gerhards2010-03-0112-28/+360
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tools/syslogd.c
| * | cosmetic: added bugentry to changelogRainer Gerhards2010-03-011-0/+4
| | |
| * | Merge branch 'v4-stable' into tmpRainer Gerhards2010-03-0112-28/+351
| |\|
| | * cosmetic: bugfix in ChangeLog highlightedRainer Gerhards2010-03-011-0/+4
| | |
| | * Merge branch 'v3-stable' into v4-stableRainer Gerhards2010-03-012-7/+33
| | |\ | | | | | | | | | | | | | | | | Conflicts: runtime/ctok.c
| | | * bugfix: comment char ('#') in literal terminated script parsingRainer Gerhards2010-03-012-7/+33
| | | | | | | | | | | | | | | | | | | | ...and thus could not be used. but tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=119
| | * | cleanup: removed debug messages that accidently made it into the commitRainer Gerhards2010-03-012-2/+1
| | | |
| | * | fixed typo that (could have) caused compilation fail under FreeBSDRainer Gerhards2010-03-011-3/+3
| | | | | | | | | | | | | | | | | | | | Note that I now also prefer to use utmp.h if it is present - this seems to be much better under Linux.
| | * | make $ActonFileDefaultTemplate available to ompipeRainer Gerhards2010-03-014-15/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was not honored by the new ompipe module, because it is a local file directive (it was applied to pipes as a side-effect of using the same module for pipes and files...). I now made this a global, so that semantics are the same as previously. Not really nice, but probably the best thing to do in the current situation (everything else would involve much more overhead --- leave that for the new config system).
| | * | bugfix: fixed problem that caused compilation on FreeBSD 9.0 to fail.Rainer Gerhards2010-02-283-2/+12
| | | | | | | | | | | | | | | | | | | | bugtracker: http://bugzilla.adiscon.com/show_bug.cgi?id=181 Thanks to Christiano for reporting.
| | * | Description: Correct error in rsyslog.conf(5) man pageMichael Biebl2010-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | $InputUDPServerRun config variable does not exist, should be $UDPServerRun instead http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=571202 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * | some code cleanupRainer Gerhards2010-02-284-15/+12
| | | |
| | * | moved pipe code to its own moduleRainer Gerhards2010-02-285-1/+284
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ... based on old omfile. Michael Biebl reported that xconsole seems to have some issues with the new pipe code, so it was best to use the old code for pipes. The optimizations were done to speed up file access, so it doesn't really matter pipes do not receive them.
| * | | fully integrated parser fixes from v4.6.0Rainer Gerhards2010-02-252-5/+14
| | | | | | | | | | | | | | | | | | | | This also made necessary a parser test case updates. Acutally, the test case was wrong, but I did not notice that before.
| * | | Merge branch 'v4-stable' into 'v5-beta'Rainer Gerhards2010-02-258-16/+86
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tools/syslogd.c
* | | | added capability to turn off standard LF delimiter in TCP serverRainer Gerhards2010-03-016-14/+46
| | | | | | | | | | | | | | | | via new directive "$InputTCPServerDisableLFDelimiter on"
* | | | Merge branch 'v4-stable' into tmpRainer Gerhards2010-02-251-11/+31
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html
| * | | doc bugfix: ChangeLog heading claimed that 4.6.0 was v4-betaRainer Gerhards2010-02-251-2/+6
| | | | | | | | | | | | | | | | while the rest of the entry correctly said it was stable.
| * | | preparing for 4.6.0 releasev4.6.0Rainer Gerhards2010-02-243-2/+11
| | | |
* | | | updated project statusRainer Gerhards2010-02-251-10/+6
| | | |
* | | | fully integrated parser fixes from v4.6.0Rainer Gerhards2010-02-253-6/+15
| | | | | | | | | | | | | | | | | | | | This also made necessary some parser test case updates. Acutally, the test case was wrong, but I did not notice that before.
* | | | Merge branch 'v4-beta' into masterRainer Gerhards2010-02-248-16/+74
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/manual.html tools/syslogd.c
| * | | doc update: added link to "rsyslog cookbook"Rainer Gerhards2010-02-231-0/+1
| | | |
| * | | message parser fixes and testbench enhancementsRainer Gerhards2010-02-225-11/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - improved testbench to contain samples for totally malformed messages which miss parts of the message content - bugfix: some malformed messages could lead to a missing LF inside files or some other missing parts of the template content. - bugfix: if a message ended immediately with a hostname, the hostname was mistakenly interpreted as TAG, and localhost be used as hostname
| * | | bugfix: message without MSG part could case a segfaultRainer Gerhards2010-02-226-10/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [backported from v5 commit 98d1ed504ec001728955a5bcd7916f64cd85f39f] This actually was a "recent" regression, but I did not realize that it was introduced by the performance optimization in v4-devel. Shame on me for having two devel versions at the same time...
| * | | updated rsyslog/php-syslog-ng doc, now that phpLogCon has evolved so muchRainer Gerhards2010-02-171-7/+9
| | | |
* | | | added additional test case (based on real-life problem)Rainer Gerhards2010-02-192-0/+8
| | | |
* | | | Merge branch 'beta' into masterRainer Gerhards2010-02-1017-55/+495
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | Conflicts: ChangeLog tests/parsertest.sh
| * | | Merge branch 'v4-beta' into betaRainer Gerhards2010-02-1016-50/+472
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c template.c tests/Makefile.am tests/parsertest.sh
| | * | preparing for 4.5.8v4.5.8Rainer Gerhards2010-02-104-3/+7
| | | |
| | * | minor doc fix: wrong defaultRainer Gerhards2010-02-091-1/+1
| | | | | | | | | | | | | | | | ... that clearly showed I could not do my math ;)
| | * | fixed a small memory leak during config file parsingRainer Gerhards2010-02-091-1/+4
| | | |
| | * | added one more test to testbenchRainer Gerhards2010-02-083-0/+28
| | | |
| | * | enhanced test suiteRainer Gerhards2010-02-083-2/+33
| | | | | | | | | | | | | | | | | | | | now CSV and regex extraction are being tested (would have caught the bug fixed with the last commit).
| | * | several bugfixes for the property replacerRainer Gerhards2010-02-082-44/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - bugfix: property replacer returned invalid parameters under some (unusual) conditions. In extreme cases, this could lead to garbled logs and/or a system failure. - bugfix: invalid length returned (often) when using regular expressions inside the property replacer - bugfix: submatch regex in property replacer did not honor "return 0 on no match" config case
| | * | integrated new PostgreSQL docRainer Gerhards2010-02-085-0/+340
| | | | | | | | | | | | | | | | converted to html, linked, etc...
| | * | improved PostgreSQL database create script, provided doc on PostgreSQL setupMarc Schiffbauer2010-02-082-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * | bugfix: imuxsock incorrectly stated inputname "imudp"Rainer Gerhards2010-02-062-2/+4
| | | | | | | | | | | | | | | | Thanks to Ryan Lynch for reporting this.
| * | | bugfix: omruleset failed to work in many casesRainer Gerhards2010-02-082-5/+21
| | | | | | | | | | | | | | | | | | | | bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=179 Thanks to Ryan B. Lynch for reporting this issue.
* | | | updated project statusRainer Gerhards2010-02-101-4/+4
| | | |
* | | | updated project statusRainer Gerhards2010-02-052-5/+7
| | | |
* | | | preparing for 5.5.2v5.5.2Rainer Gerhards2010-02-054-4/+4
| | | |
* | | | Merge branch 'beta'Rainer Gerhards2010-02-046-7/+23
|\| | |
| * | | Merge branch 'v4-beta' into betaRainer Gerhards2010-02-046-7/+23
| |\| |
| | * | Merge branch 'v4-stable' into v4-betaRainer Gerhards2010-02-046-7/+23
| | |\ \
| | | * | bugfix: several smaller bugs resolved after flexelint reviewvarmojfekoj2010-02-047-8/+24
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | | Merge branch 'beta'Rainer Gerhards2010-02-032-1/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/manual.html
| * | | | Merge branch 'v4-beta' into betaRainer Gerhards2010-02-032-1/+8
| |\| | |