summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'systemd' into v5-develRainer Gerhards2010-09-088-39/+785
|\
| * moved systemd interface to rsyslog convenience libRainer Gerhards2010-09-084-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 filesRainer Gerhards2010-09-072-0/+705
| |
| * acquire /dev/log socket optionally from systemdLennart Poettering2010-09-076-37/+87
| |
* | Merge branch 'v5-beta' into v5-develRainer Gerhards2010-08-111-4/+6
|\ \
| * | fixed some issueizotov2010-08-111-4/+6
| | |
* | | Merge branch 'v4-devel' into v5-develRainer Gerhards2010-08-118-20/+87
|\ \ \
| * \ \ Merge branch 'v4-stable-imptcp' into v4-develRainer Gerhards2010-08-118-20/+87
| |\ \ \
| | * | | imptcp: added $InputPTCPServerAddtlFrameDelimiter directiveRainer Gerhards2010-08-118-12/+78
| | | | | | | | | | | | | | | | | | | | also improved testbench
| | * | | fixed minor issue: imptcp did a close(-1) on each acceptRainer Gerhards2010-08-111-1/+2
| | | | |
| | * | | imptcp: added $InputPTCPServerNotifyOnConnectionClose directiveRainer Gerhards2010-08-112-8/+8
| | | | | | | | | | | | | | | | | | | | plus some minor cleanup
* | | | | fix required for new engineRainer Gerhards2010-08-111-1/+0
| | | | |
* | | | | Merge branch 'v4-devel' into masterRainer Gerhards2010-08-1119-62/+1434
|\| | | | | |_|/ / |/| | | | | | | | | | | | | | | Conflicts: Makefile.am tests/tcpflood.c
| * | | Merge branch 'v4-stable-imptcp' into tmpRainer Gerhards2010-08-1119-62/+1434
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile.am configure.ac runtime/rsyslog.h tests/Makefile.am
| | * | more testbench improvements and new testsRainer Gerhards2010-08-106-58/+107
| | | |
| | * | small improvements to testbenchRainer Gerhards2010-08-102-1/+3
| | | |
| | * | some cleanup and minor optimizationRainer Gerhards2010-08-101-33/+32
| | | |
| | * | added tests for imptcp and fixed some problems with itRainer Gerhards2010-08-105-19/+78
| | | | | | | | | | | | | | | | it now also works reliably in edge-triggered mode
| | * | added imptcpRainer Gerhards2010-08-1010-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.7Rainer Gerhards2010-08-093-3/+3
| | | |
* | | | Merge branch 'v4-devel'Rainer Gerhards2010-08-092-4/+4
|\| | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h
| * | | doc nit: wrong title in omuxsock pageRainer Gerhards2010-08-091-1/+1
| | | | | | | | | | | | | | | | thanks to David Lang for finding this issue
| * | | solving an error ID collision with v5 buildRainer Gerhards2010-08-061-1/+1
| | | |
* | | | fixing a nit introduced in last mergeRainer Gerhards2010-08-061-0/+1
| | | |
* | | | Merge branch 'v4-devel'Rainer Gerhards2010-08-0614-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 socketsRainer Gerhards2010-08-0614-4/+600
| | | | | | | | | | | | | | | | this is the counterpart to imuxsock, enabling fast local forwarding
* | | | changed omudpspoof default spoof address to simplify typical use caseRainer Gerhards2010-08-054-9/+28
| | | |
* | | | minor bug fixesRainer Gerhards2010-08-054-5/+14
| | | | | | | | | | | | | | | | | | | | - doc for pmlastmsg and ruleset parsers were hard to read - pmrfc3164sd had wrong name
* | | | Merge branch 'v4-devel'Rainer Gerhards2010-08-054-31/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/Makefile.am doc/manual.html doc/professional_support.html
| * | | Merge branch 'v4-stable' into v4-develRainer Gerhards2010-08-054-117/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | preparing for 4.6.4v4.6.4Rainer Gerhards2010-08-053-3/+3
| | | |
| | * | Merge branch 'v3-stable' into v4-stableRainer Gerhards2010-08-054-117/+4
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/professional_support.html
| | | * | preparing for 3.22.2v3.22.2Rainer Gerhards2010-08-055-94/+5
| | | | |
* | | | | Merge branch 'v4-devel' into masterRainer Gerhards2010-08-053-7/+23
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2010-08-053-4/+21
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | Merge branch 'v3-stable' into v4-stableRainer Gerhards2010-08-052-1/+5
| | |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/conf.c
| | | * | program name filter ! in the configuration cannot be resetKiss Gabor (Bitman)2010-08-052-2/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * | | bugfix: zero-sized (empty) messages were processed by imtcpRainer Gerhards2010-07-282-2/+11
| | | | | | | | | | | | | | | | | | | | they are now dropped as they always should have been
| | * | | bumped version numberRainer Gerhards2010-07-071-0/+2
| | | | |
| | * | | preparing for 4.6.3v4.6.3Rainer Gerhards2010-07-073-3/+3
| | | | |
* | | | | break potential infinite loop in actionDoRetrySteffen Sledz2010-08-051-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 ressourceRainer Gerhards2010-07-283-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.6Rainer Gerhards2010-07-216-7/+5
| |_|_|/ |/| | |
* | | | added new parser modulesRainer Gerhards2010-07-1312-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 specifiedRainer Gerhards2010-07-091-1/+1
| | | | | | | | | | | | | | | | ... in the proper way for a non.builtin module.
* | | | added new pm3164sd parser moduleRainer Gerhards2010-07-074-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 masterRainer Gerhards2010-07-051-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog Makefile.am
| * \ \ \ Merge branch 'v4-stable' into tmpRainer Gerhards2010-07-0517-51/+340
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog Makefile.am tests/Makefile.am
* | | | | Merge branch 'v4-devel'Rainer Gerhards2010-07-052-0/+3
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2010-07-052-0/+3
| |\ \ \ \ | | | |/ / | | |/| |