summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* re-enabled commented-out serialization support in debug handlerRainer Gerhards2012-10-111-3/+3
|
* Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-045-29/+2
|\
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-044-27/+1
| |\
| | * remove cust1 dummy plugin from build systemRainer Gerhards2012-10-044-27/+1
| | | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for identifying this as the culprit for several build-related issues. The plugin is a placeholder, and was not used for quite some while. It is definitely not worth the effort to keep it along. If needed, can be quickly created.
| * | build: don't include librsyslog.la in the dist tarballMichael Biebl2012-10-041-2/+1
| | | | | | | | | | | | libtool archives are not meant to be shipped in the source tarball.
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-044-0/+32
|\| |
| * | doc: add missing files to distribution tarballRainer Gerhards2012-10-041-0/+15
| | | | | | | | | | | | Thanks to Michael Biebl for alerting me of the problem.
| * | bugfix: comments inside objects (e.g. action()) were not properly handledRainer Gerhards2012-10-042-0/+2
| | |
| * | cosmetic: add few files to .gitignoreRainer Gerhards2012-10-041-0/+15
| | |
* | | integrate logctl into build processRainer Gerhards2012-10-024-456/+482
| | |
* | | add new tool "logctl" to access lumberjack logs in MongoDBUlrike Gerhards2012-10-021-0/+456
| | |
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-022-1/+3
|\| |
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-021-2/+2
| |\|
| | * minor: disable debug support in complex1.sh testRainer Gerhards2012-10-021-2/+2
| | |
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-023-3/+5
| |\|
| | * cleanupRainer Gerhards2012-10-021-1/+1
| | |
| | * bugfix: fixed wrong bufferlength for snprintf in tcpflood.cAndre Lorbach2012-09-283-3/+5
| | | | | | | | | | | | | | | The problem occured when using the -f (dynafiles) option, and caused some tests to fail.
* | | Merge branch 'v6-devel-input' into v6-develRainer Gerhards2012-09-288-153/+578
|\ \ \
| * | | doc: update module doc to new config formatFlorian Riedl2012-09-285-107/+373
| | | |
| * | | imtcp: implement support for module() parametersRainer Gerhards2012-09-281-38/+135
| | | |
| * | | imptcp: implement support for module() parametersRainer Gerhards2012-09-271-7/+70
| | | |
| * | | fix whitespace issueRainer Gerhards2012-09-271-1/+0
| | | |
* | | | Merge branch 'v6-devel-input' into v6-develRainer Gerhards2012-09-2716-244/+1173
|\| | |
| * | | Do not load module if it had errorneous parametersRainer Gerhards2012-09-273-12/+58
| | | |
| * | | cosmetic: remove irrelevant compiler warningRainer Gerhards2012-09-271-1/+1
| | | | | | | | | | | | | | | | v7 does not even have this code any longer
| * | | bugfix: config errors did not always cause statement to failRainer Gerhards2012-09-274-28/+114
| | | | | | | | | | | | | | | | This could lead to startup with invalid parameters.
| * | | imfile: implement support for module parameters via module() stmtRainer Gerhards2012-09-272-9/+80
| | | |
| * | | yet another nitfix...Rainer Gerhards2012-09-271-1/+1
| | | |
| * | | nitfixRainer Gerhards2012-09-271-2/+2
| | | |
| * | | imfile: implement support for input()Rainer Gerhards2012-09-271-3/+78
| | | |
| * | | milestone: port imfile to v6 config systemRainer Gerhards2012-09-262-149/+279
| | | |
| * | | imrelp: implement support for input()Rainer Gerhards2012-09-261-10/+76
| | | |
| * | | imudp: implement support for input()Rainer Gerhards2012-09-262-9/+84
| | | |
| * | | imptcp: implement support for input()Rainer Gerhards2012-09-262-15/+119
| | | |
| * | | cleanupRainer Gerhards2012-09-261-2/+0
| | | |
| * | | imtcp: implement support for input()Rainer Gerhards2012-09-261-10/+89
| | | |
| * | | cleanupRainer Gerhards2012-09-261-3/+0
| | | |
| * | | Implement input() support in imuxsockRainer Gerhards2012-09-261-10/+119
| | | |
| * | | Merge branch 'v6-stable' into v6-devel-inputRainer Gerhards2012-09-262-0/+9
| |\| |
| * | | input stmt: add core engine plumbingRainer Gerhards2012-09-265-1/+96
| | | |
| * | | cleanupRainer Gerhards2012-09-261-2/+0
| | | |
* | | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-262-0/+9
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-262-0/+9
| |\| | | | | | | | | | | | | Conflicts: plugins/imrelp/imrelp.c
| | * enable DNS resolution in imrelpApollon Oikonomopoulos2012-09-262-0/+9
| | |
* | | minor cleanupRainer Gerhards2012-09-251-1/+0
| | |
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-231-7/+0
|\| | | | | | | | | | | | | | Conflicts: runtime/glbl.c
| * | Remove no longer needed functionRainer Gerhards2012-09-231-5/+0
| | | | | | | | | | | | | | | | | | Thanks to Andreas Stieger from Novell/SUSE for alerting us. This function was introduced as part of the new config system, but never was actually used (aka "not needed").
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-212-1/+5
|\| |
| * | Implemented different grammar for pri filtersRainer Gerhards2012-09-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The method introduced by the previous commit caused issues in v7 as it was too generic. Most importantly, it permitted simple words (like "stop") to (invalidly) be detected as pri filters. Now, the grammar is close to the initial one, and each pri filter must at least have a comma or a period inside it, which does not conflict with simple words.
| * | bugfix: some valid legacy PRI filters were flagged as errornousRainer Gerhards2012-09-212-1/+5
| | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=358 This happend to filters of the style "local0,local1.*", where the multiple facilities were comma-separated.