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 'v6-stable' into v6-develRainer Gerhards2012-10-044-0/+32
| | |\ \ \ \
| * | \ \ \ \ Merge branch 'beta'Rainer Gerhards2012-10-103-5/+24
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | | | cosmetic cleanupRainer Gerhards2012-10-091-3/+1
| | | | | | |
| | * | | | | prepare for 7.1.9 releasev7.1.9Rainer Gerhards2012-10-093-4/+4
| | | | | | |
| | * | | | | bugfix: in (non)equal comparisons the position of arrays influenced resultRainer Gerhards2012-10-092-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This behaviour is OK for "contains"-type of comparisons (which have quite different semantics), but not for == and <>, which shall be commutative. This has been fixed now, so there is no difference any longer if the constant string array is the left or right hand operand. We solved this via the optimizer, as it keeps the actual script execution code small.
* | | | | | | imfile: converted to new ratelimit interfaceRainer Gerhards2012-10-151-15/+7
| | | | | | |
* | | | | | | ratelimit: imtcp (and gssapi) converted to new interfaceRainer Gerhards2012-10-154-17/+10
| | | | | | |
* | | | | | | imudp: add input batching & ratelimiter interfaceRainer Gerhards2012-10-155-6/+17
| | | | | | |
* | | | | | | ratelimiter: enable thread-safe mode & (related) API changesRainer Gerhards2012-10-159-105/+101
| | | | | | |
* | | | | | | Change debug output defaults to match current needsRainer Gerhards2012-10-151-2/+2
| | | | | | |
* | | | | | | indicate no original code left in imudpRainer Gerhards2012-10-151-2/+0
| | | | | | |
* | | | | | | interface cleanup (probably not final)Rainer Gerhards2012-10-1510-25/+24
| | | | | | |
* | | | | | | milestone: ratelimiter used in imptcpRainer Gerhards2012-10-156-26/+111
| | | | | | |
* | | | | | | milestone: experimental rate limiter used in imuxsockRainer Gerhards2012-10-125-1/+169
| | | | | | |
* | | | | | | new ratelimit: interface plumbing addedRainer Gerhards2012-10-0914-20/+127
|/ / / / / / | | | | | | | | | | | | | | | | | | no actual implementation yet done
* | | | | | preparing for 7.3.0 releasev7.3.0Rainer Gerhards2012-10-083-3/+3
| | | | | |
* | | | | | fix compile problem with DEBUG instrumentation enabledRainer Gerhards2012-10-081-1/+0
| | | | | |
* | | | | | Merge branch 'c1-streamzip' into master-streamzipRainer Gerhards2012-10-055-51/+125
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/rsyslog_conf_global.html runtime/stream.c tools/omfile.c
| * | | | | | improved omfile zip writer to increase compressionRainer Gerhards2012-09-146-51/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was achieved by somewhat reducing the robustness of the zip archive. This is controlled by the new setting $OMFileVeryReliableZip.
* | | | | | | Merge branch 'beta'Rainer Gerhards2012-10-046-28/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | re-delete cust1.c plugin dummy fileRainer Gerhards2012-10-041-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is no longer needed.
| * | | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-045-28/+2
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | Conflicts: plugins/cust1/Makefile.am
| | * | | | | 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.
* | / | | | omlibdbi improvementsRainer Gerhards2012-10-043-44/+161
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * support for config load phases & module() parameters * support for default templates * driverdirectory is now cleanly a global parameter, but can no longer be specified as an action paramter. Note that in previous versions this parameter was ignored in all but the first action definition NOTE: more solid testing is needed for these changes. We spare this, as the module is scheduled for more work. This commit is more or less staging work.
* | | | | doc: add missing files to distribution tarballRainer Gerhards2012-10-042-0/+6
| | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for alerting me of the problem.
* | | | | Merge branch 'v6-stable' into betaRainer 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
| | | | |
* | | | | prepare for 7.1.8 releasev7.1.8Rainer Gerhards2012-10-023-6/+6
| | | | |
* | | | | add "parser" parameter to ruleset(), so that parser chain can be configuredRainer Gerhards2012-10-024-8/+35
| | | | |
* | | | | get rid of compiler warningRainer Gerhards2012-10-021-4/+0
| | | | |
* | | | | cleanupRainer Gerhards2012-10-021-3/+0
| | | | |
* | | | | mmjsonparse: also add MSG part of message if CEE-parsing failsRainer Gerhards2012-10-022-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In that case, the CEE/lumberjack spec says MSG is NON-CEE and must be treated accordingly. This means no JSON parsing happens. The case is equal to missing CEE cookie. Also adapted module to new interfaces provided by msg object.
* | | | | Change mmjsonparse so non-json messages doesn't get lost from ceelogMilan Bartos2012-10-021-0/+9
| | | | | | | | | | | | | | | | | | | | modified: mmjsonparse.c
* | | | | Merge branch 'v6-devel'Rainer Gerhards2012-10-024-0/+482
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | 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-devel'Rainer Gerhards2012-10-022-1/+3
|\| | | |
| * | | | 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.
* | | | | minor: mention better doc in ChangeLogRainer Gerhards2012-10-021-0/+1
| | | | |