summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-devel'Rainer Gerhards2011-03-3140-78/+999
|\ | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html doc/rsyslog_conf.html runtime/msg.c runtime/rsyslog.h template.c
| * Merge branch 'v5-beta' into v5-develRainer Gerhards2011-03-3126-33/+685
| |\ | | | | | | | | | | | | Conflicts: ChangeLog
| | * improved testbench, updated ChangeLog to reflect recent bugfixRainer Gerhards2011-03-313-10/+42
| | | | | | | | | | | | | | | | | | After trying out some more things with the new code (after last bugfix), I now think that the bugfix is OK to use and without regressions.
| | * stop adding data to DA queue when low watermark has been reachedRainer Gerhards2011-03-301-0/+4
| | | | | | | | | | | | | | | potentially closes: http://bugzilla.adiscon.com/show_bug.cgi?id=241 But needs more verification.
| | * fixed problem in testbench & added new test (not yet integrated)Rainer Gerhards2011-03-307-6/+143
| | | | | | | | | | | | | | | The test is a setup scenario for this bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=241
| | * testbench samples incorrect, correctedv5.7.10Rainer Gerhards2011-03-292-2/+2
| | | | | | | | | | | | | | | | | | this was due to the old RFC5424 parser being considered correct, what it was not. As such, the samples generated from it were incorrect as well. Now with the corrected parsers, the tests failed.
| | * preparing for 5.7.10Rainer Gerhards2011-03-293-3/+3
| | |
| | * doc: adding bugfix to ChangeLogRainer Gerhards2011-03-291-0/+2
| | |
| | * Force ANSI SQL treatment of strings for PostgresChristian Kastner2011-03-291-1/+6
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * manually merging ChangeLogRainer Gerhards2011-03-291-2/+2
| | |
| | * Merge branch 'v5-beta-strgen-bind' into v5-betaRainer Gerhards2011-03-297-3/+424
| | |\
| | | * did mapping of data items to database table columnsRainer Gerhards2011-03-291-14/+9
| | | | | | | | | | | | | | | | to facilitate testing
| | | * bugfix: error return from strgen caused abort, now causes action to be ignoredRainer Gerhards2011-03-292-1/+4
| | | | | | | | | | | | | | | | ...(just like a failed filter)
| | | * sm_cust_bindcdr: custom date parsing addedRainer Gerhards2011-03-281-10/+90
| | | |
| | | * sm_bind_cdr: added capability to configure "allowed IPs"Rainer Gerhards2011-03-221-3/+80
| | | |
| | | * added internal processing of BIND recordsRainer Gerhards2011-03-221-6/+115
| | | | | | | | | | | | | | | | | | | | still some questions outstanding, so actual SQL statement is not usable at the moment
| | | * bugfix: strgen could not be used together with database outputsRainer Gerhards2011-03-213-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | because the sql/stdsql option could not be specified. This has been solved by permitting the strgen to include the opton inside its name. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=195
| | | * Merge branch 'v5-beta' into v5-beta-strgen-bindRainer Gerhards2011-03-211-6/+23
| | | |\
| | | * | setup test environment and test code in order to look at...Rainer Gerhards2011-03-171-31/+14
| | | | | | | | | | | | | | | | | | | | | | | | | bug http://bugzilla.adiscon.com/show_bug.cgi?id=195 That bug currently prevents strgen's to be used with databases
| | | * | prepared skeleton for new strgen moduleRainer Gerhards2011-03-175-0/+168
| | | | |
| | * | | bugfix: rsyslog did not build with --disable-regexp configure optionRainer Gerhards2011-03-282-3/+11
| | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=243
| | * | | bugfix: PRI was invalid on Solaris for message from local log socketCorey Smith2011-03-242-3/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: root <root@localhost.localdomain>
| | * | | enhance: added $BOM system property to ease writing byte order masksRainer Gerhards2011-03-224-0/+18
| | | | |
| | * | | bugfix: RFC5424 parser confused by empty structured dataRainer Gerhards2011-03-222-2/+3
| | | |/ | | |/| | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=237
| | * | potential fix to issue that strgen's do not support SQL optionRainer Gerhards2011-03-211-6/+23
| | |/ | | | | | | | | | needs testig and verification (wrong system for doing that ;))
| | * some minor enhancements to doc set -- point to more examplesRainer Gerhards2011-03-171-4/+7
| | |
| | * preparing for 5.7.9v5.7.9Rainer Gerhards2011-03-163-3/+6
| | |
| | * backporting patch for clean make distcheckRainer Gerhards2011-03-163-0/+14
| | |
| * | added bug info to change logRainer Gerhards2011-03-161-0/+4
| | |
| * | Merge branch 'v5-beta' into v5-develRainer Gerhards2011-03-1620-51/+320
| |\|
| | * added some more valgrind-based testsRainer Gerhards2011-03-165-0/+74
| | |
| | * Merge branch 'v5-stable' into v5-betaRainer Gerhards2011-03-1616-52/+247
| | |\ | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am
| | | * fixed a regression of last patch and some cleanupRainer Gerhards2011-03-167-17/+38
| | | |
| | | * bugfix: failover did not work correctly if repeated msg reduction was onRainer Gerhards2011-03-1613-49/+223
| | | | | | | | | | | | | | | | affected directive was: $ActionExecOnlyWhenPreviousIsSuspended on
* | | | some more minor changesRainer Gerhards2011-03-173-7/+9
| | | |
* | | | some more slight improvements to the docRainer Gerhards2011-03-172-3/+8
| | | |
* | | | forgot to update changelogRainer Gerhards2011-03-171-0/+3
| | | |
* | | | somewhat improved documentation indexTom Bergfeld2011-03-174-54/+105
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | preparing for 6.1.6v6.1.6Rainer Gerhards2011-03-143-3/+3
| | | |
* | | | fixed double-free regerssion, probably caused by last mergeRainer Gerhards2011-03-142-6/+1
| | | |
* | | | fixed compile problem in imtemplateRainer Gerhards2011-03-142-1/+3
| | | | | | | | | | | | | | | | fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=235
* | | | Merge branch 'v5-devel'Rainer Gerhards2011-03-1410-17/+58
|\| | | | | | | | | | | | | | | | | | | Conflicts: tests/diag.sh
| * | | testbench bugfix: work file was left overRainer Gerhards2011-03-141-1/+1
| | | |
| * | | fixing cosmetic memory leak in imdiag, imfileRainer Gerhards2011-03-143-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | This had no real consequences, as it happend exactly once during the runtime, so the OS cleaned up. However, it broke the valgrind testbench.
| * | | Merge branch 'v5-beta' into v5-develRainer Gerhards2011-03-1421-24/+203
| |\| |
| | * | added the template modules to the things being checked during distcheckRainer Gerhards2011-03-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | While they are not meant for production, interface changes may not show up if they are not included in distecheck. This may be distrubing to users. The chances is even greater as there usually is no need to compile and/or check these modules during regular development.
| | * | fixed compile problem from epoll_create patchRainer Gerhards2011-03-142-2/+4
| | | |
| | * | Fall back to epoll_create() if epoll_create1() is not availableMichael Biebl2011-03-143-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | epoll_create1() was introduced in Linux kernel 2.6.27. If rsyslog was compiled on a newer kernel but run on a kernel older than 2.6.27, remote syslog fails. Apply a runtime check for epoll_create1() and fall back to epoll_create() in this case. Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617996
| * | | omhdfs: added some info on Java environment settingsRainer Gerhards2011-03-111-0/+14
| | | |
* | | | testbench bugfix: tls test failed during make distcheck...Rainer Gerhards2011-03-115-6/+10
| | | | | | | | | | | | | | | | ... due to wrong path the certificate files