Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'systemd' into v5-devel | Rainer Gerhards | 2010-09-08 | 8 | -39/+785 |
|\ | |||||
| * | moved systemd interface to rsyslog convenience lib | Rainer Gerhards | 2010-09-08 | 4 | -31/+22 |
| | | | | | | | | | | | | | | Mostly a refresh of sd-daemon.[ch] from its source plus some make file changes. We now have systemd interfaces inside rsyslog, so that all plugins interested can call the interfaces. Seems not to be totally necessary right now, but will help in the long term. | ||||
| * | added forgotten files | Rainer Gerhards | 2010-09-07 | 2 | -0/+705 |
| | | |||||
| * | acquire /dev/log socket optionally from systemd | Lennart Poettering | 2010-09-07 | 6 | -37/+87 |
| | | |||||
* | | 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 '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 | ||||
* | | | | | 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 '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. | ||||
* | | | | | preparing for 5.5.6 releasev5.5.6 | Rainer Gerhards | 2010-07-21 | 6 | -7/+5 |
| |_|_|/ |/| | | | |||||
* | | | | added new parser modules | Rainer Gerhards | 2010-07-13 | 12 | -8/+341 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | most importantly pmlastmsg, which handles the pathetic "last message repeated n times" messages that some syslogd's emit. Also some minor fixes, like wrong files names in make dist (for new files introduced after last release) | ||||
* | | | | fix: pmrfc3164 did not load because modInit was not specified | Rainer Gerhards | 2010-07-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | ... in the proper way for a non.builtin module. | ||||
* | | | | added new pm3164sd parser module | Rainer Gerhards | 2010-07-07 | 4 | -0/+368 |
| | | | | | | | | | | | | | | | | | | | | | | | | this permits to accept RFC5424 structured data from messages with RFC3164 header. This was compiled from existing modules by user izotov. | ||||
* | | | | Merge branch 'v5-stable' into master | Rainer Gerhards | 2010-07-05 | 1 | -0/+6 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog Makefile.am | ||||
| * \ \ \ | Merge branch 'v4-stable' into tmp | Rainer Gerhards | 2010-07-05 | 17 | -51/+340 |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog Makefile.am tests/Makefile.am | ||||
* | | | | | Merge branch 'v4-devel' | Rainer Gerhards | 2010-07-05 | 2 | -0/+3 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2010-07-05 | 2 | -0/+3 |
| |\ \ \ \ | | | |/ / | | |/| | |