Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | renamed conf.c to legacyconf.c to make room for new config system | Rainer Gerhards | 2011-04-19 | 23 | -24/+24 |
| | |||||
* | Merge branch 'v5-devel' | Rainer Gerhards | 2011-04-15 | 3 | -5/+25 |
|\ | | | | | | | | | Conflicts: plugins/impstats/impstats.c | ||||
| * | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-04-15 | 3 | -5/+25 |
| |\ | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-04-15 | 1 | -2/+12 |
| | |\ | |||||
| | | * | bugfix: IPv6-address could not be specified in omrelp | Rainer Gerhards | 2011-04-14 | 1 | -2/+12 |
| | | | | | | | | | | | | | | | | | | | | this was due to improper parsing of ":" closes: http://bugzilla.adiscon.com/show_bug.cgi?id=250 | ||||
| | * | | sm_cust_bindcdr: updated field mapping according to spec received today | Rainer Gerhards | 2011-04-15 | 1 | -3/+11 |
| | | | | |||||
| | * | | bugfix: doc for impstats had wrong config statements | Rainer Gerhards | 2011-04-14 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | also, config statements were named a bit inconsistent, resolved that problem by introducing an alias and only documenting the consistent statements Thanks to Marcin for bringing up this problem. | ||||
* | | | | bugfix: enhanced imudp config processing code disabled due to wrong merge | Rainer Gerhards | 2011-04-13 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | (affected UDP realtime capabilities) | ||||
* | | | | added log classification capabilities (via mmnormalize & tags) | Rainer Gerhards | 2011-04-13 | 1 | -3/+3 |
| | | | | |||||
* | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-04-12 | 1 | -1/+6 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html plugins/imtcp/imtcp.c | ||||
| * | | | added new config directive $InputTCPFlowControl... | Rainer Gerhards | 2011-04-01 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | ... to select if tcp received messages shall be flagged as light delayable or not. | ||||
* | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-03-31 | 4 | -2/+398 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html doc/rsyslog_conf.html runtime/msg.c runtime/rsyslog.h template.c | ||||
| * | | | Merge branch 'v5-beta' into v5-devel | Rainer Gerhards | 2011-03-31 | 4 | -2/+398 |
| |\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | | fixed problem in testbench & added new test (not yet integrated) | Rainer Gerhards | 2011-03-30 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | The test is a setup scenario for this bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=241 | ||||
| | * | | Force ANSI SQL treatment of strings for Postgres | Christian Kastner | 2011-03-29 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| | * | | did mapping of data items to database table columns | Rainer Gerhards | 2011-03-29 | 1 | -14/+9 |
| | | | | | | | | | | | | | | | | to facilitate testing | ||||
| | * | | sm_cust_bindcdr: custom date parsing added | Rainer Gerhards | 2011-03-28 | 1 | -10/+90 |
| | | | | |||||
| | * | | sm_bind_cdr: added capability to configure "allowed IPs" | Rainer Gerhards | 2011-03-22 | 1 | -3/+80 |
| | | | | |||||
| | * | | added internal processing of BIND records | Rainer Gerhards | 2011-03-22 | 1 | -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 outputs | Rainer Gerhards | 2011-03-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | setup test environment and test code in order to look at... | Rainer Gerhards | 2011-03-17 | 1 | -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 module | Rainer Gerhards | 2011-03-17 | 2 | -0/+144 |
| | | | | |||||
| | * | | backporting patch for clean make distcheck | Rainer Gerhards | 2011-03-16 | 2 | -0/+11 |
| | | | | |||||
* | | | | fixed double-free regerssion, probably caused by last merge | Rainer Gerhards | 2011-03-14 | 1 | -5/+0 |
| | | | | |||||
* | | | | fixed compile problem in imtemplate | Rainer Gerhards | 2011-03-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=235 | ||||
* | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-03-14 | 5 | -10/+41 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: tests/diag.sh | ||||
| * | | | fixing cosmetic memory leak in imdiag, imfile | Rainer Gerhards | 2011-03-14 | 2 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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-devel | Rainer Gerhards | 2011-03-14 | 4 | -11/+25 |
| |\| | | |||||
| | * | | fixed compile problem from epoll_create patch | Rainer Gerhards | 2011-03-14 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fall back to epoll_create() if epoll_create1() is not available | Michael Biebl | 2011-03-14 | 2 | -10/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 settings | Rainer Gerhards | 2011-03-11 | 1 | -0/+14 |
| | | | | |||||
* | | | | bugfix: very minor memory leak in imfile | Rainer Gerhards | 2011-03-11 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | almost cosmetic: leaks a few bytes once during a run -- more a problem for valgrind testing -- not for practical use | ||||
* | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-03-11 | 1 | -12/+73 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/omhdfs/omhdfs.c | ||||
| * | | | Merge branch 'v5-beta' into v5-devel | Rainer Gerhards | 2011-03-09 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | | enhanced omhdfs to support batching mode. This permits to increase performance, | Rainer Gerhards | 2011-03-09 | 1 | -12/+73 |
| | | | | | | | | | | | | | | | | | | | | | | | | | as we now call the HDFS API with much larger message sizes and far more infrequently | ||||
* | | | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-03-11 | 38 | -9/+54 |
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/omlibdbi/omlibdbi.c tests/Makefile.am tests/diag.sh | ||||
| * | | | | bugfix: minor memory leak in omlibdbi (< 1k per instance and run) | Rainer Gerhards | 2011-03-10 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | also testbench improvement (omlibdbi now also receives a couple of tests if we have a life MySQL server). | ||||
| * | | | | bugfix: pmaixforwarded from fails to build | Michael Biebl | 2011-03-10 | 1 | -0/+1 |
| | |/ / | |/| | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2011-03-09 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Merge branch 'v4-stable' into tmp | Rainer Gerhards | 2011-03-09 | 1 | -1/+1 |
| | |\| | |||||
| | | * | bugfix: omlibdbi did not use password from rsyslog.con | Rainer Gerhards | 2011-03-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=203 | ||||
| * | | | bugfix: (regression) omhdfs did no longer compile | Rainer Gerhards | 2011-03-09 | 1 | -0/+1 |
| | | | | |||||
| * | | | forgot to backport imdiag mem leak fix -- now done | Rainer Gerhards | 2011-03-06 | 1 | -0/+4 |
| | | | | |||||
| * | | | fixed small regression from gnutls fd leak fix | Rainer Gerhards | 2011-03-06 | 3 | -0/+3 |
| | | | | |||||
| * | | | Merge branch 'v5-beta-gtls-fix' into v5-beta | Rainer Gerhards | 2011-03-06 | 31 | -0/+31 |
| |\ \ \ | |||||
| | * | | | added work-around for bug in gtls, which causes fd leak when using TLS | Bojan Smojver | 2011-02-23 | 31 | -0/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The capability has been added for module to specify that they do not like being unloaded. related bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=222 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | | | improved testbench | Rainer Gerhards | 2011-03-01 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | - added valgrind-based test (the first one ever ;)) - fixed memory leak in imdiag (guess how this was detected...) | ||||
* | | | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-25 | 1 | -5/+17 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | | fixed compile problems on Solaris | Rainer Gerhards | 2011-02-23 | 1 | -0/+4 |
| |/ / / | |||||
| * | | | the last fix introduced another regression, fixed now | Rainer Gerhards | 2011-02-22 | 1 | -5/+8 |
| | | | | | | | | | | | | | | | | | | | | The previous fix left variable lenMsg in an inconsistent state when sanitization actually happend. This could lead to message truncation. |