Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | prepared for 6.1.0v6.1.0 | Rainer Gerhards | 2010-08-11 | 1 | -1/+1 |
| | |||||
* | added very rough document on config scoping | Rainer Gerhards | 2010-08-11 | 3 | -0/+42 |
| | | | | ... but at least there is now *some* doc available. | ||||
* | Merge branch 'v5-devel' | Rainer Gerhards | 2010-08-11 | 1 | -4/+6 |
|\ | |||||
| * | Merge branch 'v5-beta' into v5-devel | Rainer Gerhards | 2010-08-11 | 1 | -4/+6 |
| |\ | |||||
| | * | fixed some issue | izotov | 2010-08-11 | 1 | -4/+6 |
| | | | |||||
* | | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-08-11 | 8 | -20/+87 |
|\| | | |||||
| * | | Merge branch 'v4-devel' into v5-devel | Rainer Gerhards | 2010-08-11 | 8 | -20/+87 |
| |\ \ | |||||
| | * \ | Merge branch 'v4-stable-imptcp' into v4-devel | Rainer Gerhards | 2010-08-11 | 8 | -20/+87 |
| | |\ \ | |||||
| | | * | | imptcp: added $InputPTCPServerAddtlFrameDelimiter directive | Rainer Gerhards | 2010-08-11 | 8 | -12/+78 |
| | | | | | | | | | | | | | | | | | | | | also improved testbench | ||||
| | | * | | fixed minor issue: imptcp did a close(-1) on each accept | Rainer Gerhards | 2010-08-11 | 1 | -1/+2 |
| | | | | | |||||
| | | * | | imptcp: added $InputPTCPServerNotifyOnConnectionClose directive | Rainer Gerhards | 2010-08-11 | 2 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | plus some minor cleanup | ||||
* | | | | | Merge branch 'master' into tmp | Rainer Gerhards | 2010-08-11 | 33 | -109/+2092 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/omudpspoof/omudpspoof.c runtime/rsyslog.h also updated omuxsock and imptcp to new interfaces | ||||
| * | | | | fix required for new engine | Rainer Gerhards | 2010-08-11 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Merge branch 'v4-devel' into master | Rainer Gerhards | 2010-08-11 | 19 | -62/+1434 |
| |\| | | | | |_|/ | |/| | | | | | | | | | | | | | | Conflicts: Makefile.am tests/tcpflood.c | ||||
| | * | | Merge branch 'v4-stable-imptcp' into tmp | Rainer Gerhards | 2010-08-11 | 19 | -62/+1434 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile.am configure.ac runtime/rsyslog.h tests/Makefile.am | ||||
| | | * | more testbench improvements and new tests | Rainer Gerhards | 2010-08-10 | 6 | -58/+107 |
| | | | | |||||
| | | * | small improvements to testbench | Rainer Gerhards | 2010-08-10 | 2 | -1/+3 |
| | | | | |||||
| | | * | some cleanup and minor optimization | Rainer Gerhards | 2010-08-10 | 1 | -33/+32 |
| | | | | |||||
| | | * | added tests for imptcp and fixed some problems with it | Rainer Gerhards | 2010-08-10 | 5 | -19/+78 |
| | | | | | | | | | | | | | | | | it now also works reliably in edge-triggered mode | ||||
| | | * | added imptcp | Rainer Gerhards | 2010-08-10 | 10 | -3/+1267 |
| | | | | | | | | | | | | | | | | | | | | imptcp is a simplified, Linux-specific and potentielly fast syslog plain tcp input plugin (NOT supporting TLS!) | ||||
| * | | | preparing for 5.5.7v5.5.7 | Rainer Gerhards | 2010-08-09 | 3 | -3/+3 |
| | | | | |||||
| * | | | Merge branch 'v4-devel' | Rainer Gerhards | 2010-08-09 | 2 | -4/+4 |
| |\| | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h | ||||
| | * | | doc nit: wrong title in omuxsock page | Rainer Gerhards | 2010-08-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | thanks to David Lang for finding this issue | ||||
| | * | | solving an error ID collision with v5 build | Rainer Gerhards | 2010-08-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | fixing a nit introduced in last merge | Rainer Gerhards | 2010-08-06 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'v4-devel' | Rainer Gerhards | 2010-08-06 | 14 | -2/+599 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog Makefile.am configure.ac doc/rsyslog_conf_modules.html runtime/rsyslog.h tests/Makefile.am | ||||
| | * | | added omuxsock, which permits to write message to local Unix sockets | Rainer Gerhards | 2010-08-06 | 14 | -4/+600 |
| | | | | | | | | | | | | | | | | this is the counterpart to imuxsock, enabling fast local forwarding | ||||
| * | | | changed omudpspoof default spoof address to simplify typical use case | Rainer Gerhards | 2010-08-05 | 4 | -9/+28 |
| | | | | |||||
| * | | | minor bug fixes | Rainer Gerhards | 2010-08-05 | 4 | -5/+14 |
| | | | | | | | | | | | | | | | | | | | | - doc for pmlastmsg and ruleset parsers were hard to read - pmrfc3164sd had wrong name | ||||
| * | | | Merge branch 'v4-devel' | Rainer Gerhards | 2010-08-05 | 4 | -31/+3 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/Makefile.am doc/manual.html doc/professional_support.html | ||||
| | * | | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2010-08-05 | 4 | -117/+4 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | | * | preparing for 4.6.4v4.6.4 | Rainer Gerhards | 2010-08-05 | 3 | -3/+3 |
| | | | | |||||
| | | * | Merge branch 'v3-stable' into v4-stable | Rainer Gerhards | 2010-08-05 | 4 | -117/+4 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/professional_support.html | ||||
| | | | * | preparing for 3.22.2v3.22.2 | Rainer Gerhards | 2010-08-05 | 5 | -94/+5 |
| | | | | | |||||
* | | | | | Merge branch 'master' into newconf | Rainer Gerhards | 2010-08-05 | 7 | -79/+26 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/manual.html | ||||
| * | | | | Merge branch 'v4-devel' into master | Rainer Gerhards | 2010-08-05 | 3 | -7/+23 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | | | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2010-08-05 | 3 | -4/+21 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | | * | | Merge branch 'v3-stable' into v4-stable | Rainer Gerhards | 2010-08-05 | 2 | -1/+5 |
| | | |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/conf.c | ||||
| | | | * | program name filter ! in the configuration cannot be reset | Kiss Gabor (Bitman) | 2010-08-05 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| | | * | | bugfix: zero-sized (empty) messages were processed by imtcp | Rainer Gerhards | 2010-07-28 | 2 | -2/+11 |
| | | | | | | | | | | | | | | | | | | | | they are now dropped as they always should have been | ||||
| | | * | | bumped version number | Rainer Gerhards | 2010-07-07 | 1 | -0/+2 |
| | | | | | |||||
| | | * | | preparing for 4.6.3v4.6.3 | Rainer Gerhards | 2010-07-07 | 3 | -3/+3 |
| | | | | | |||||
| * | | | | break potential infinite loop in actionDoRetry | Steffen Sledz | 2010-08-05 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a module always returns RS_RET_OK (like ompipe does) the actionDoRetry loop may not have leaved faked ACT_STATE_SUSP state in case iResumeOKinRow had ever reached a count of 1000. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | | | rsyslog status is now a web site only ressource | Rainer Gerhards | 2010-07-28 | 3 | -72/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | and in a sense has already been -- the file was not distributed for quite some while, I just kept it for convenience in git. | ||||
* | | | | | final (?) milestone: looks like action scoping works now | Rainer Gerhards | 2010-07-27 | 1 | -1/+34 |
| | | | | | | | | | | | | | | | | | | | | but doc and testing is missing! | ||||
* | | | | | bumped version numbers | Rainer Gerhards | 2010-07-27 | 3 | -2/+15 |
| | | | | | |||||
* | | | | | fixed regression from last commit | Rainer Gerhards | 2010-07-27 | 22 | -4/+29 |
| | | | | | | | | | | | | | | | | | | | | config variables were not properly initialized | ||||
* | | | | | milestone commit: output plugin interface changes (may NOT run) | Rainer Gerhards | 2010-07-27 | 24 | -404/+657 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The output interface has been changed, but we do not yet utilize the new interface. Also, it looks like a regression was introduced. But before hunting it down, I'd like to make a commit (what also easys the regresion hunt). | ||||
* | | | | | added support to save/restore rsyslog core action settings... | Rainer Gerhards | 2010-07-23 | 5 | -134/+211 |
| | | | | | | | | | | | | | | | | | | | | | | | | | ... but not those of plugins (which are at least as important as the core ones). So this is an interim commit. | ||||
* | | | | | first shot at scoping (for actions only) | Rainer Gerhards | 2010-07-23 | 6 | -43/+140 |
| | | | | | | | | | | | | | | | | | | | | | | | | | parser now supports $Begin action, $End action, $StrictScoping, but not yet the actual semantics. |