summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | bugfix: very small memory leak in imrelpRainer Gerhards2012-11-141-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not a real problem (thus no ChangeLog entry): we leaked a few bytes for every relp listener, but only at rsyslogd TERMINATION - where obviously the OS does the cleanup. However, the leak could cause some confusion with memory checkers like valgrind.
| * | | bugfix: make rsyslog compile on kfreebsd againGuillem Jover2012-11-141-0/+2
| | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=380
* | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-131-1/+1
|\| | |
| * | | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-131-1/+1
| |\| |
| | * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-11-131-1/+1
| | |\| | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | * imuxsock: do not log EAGAIN in nonblocking recvfromMarius Tomaschewski2012-11-131-1/+1
| | | |
* | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-021-3/+3
|\| | |
| * | | bugfix: potential abort of imtcp on rsyslogd shutdownRainer Gerhards2012-11-021-3/+3
| | | |
| * | | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-018-8/+8
| |\| |
| | * | bugfix: invalid rsyslog-internal macro API useRainer Gerhards2012-11-018-8/+8
| | | | | | | | | | | | | | | | | | | | This had no bad effect, because the macro did the same as the one that should have been used.
* | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-012-3/+5
|\| | |
| * | | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-011-1/+1
| |\| |
| | * | bugfix: misaddressing of $mmnormalizeuserawmsg parameterRainer Gerhards2012-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | On many platforms, this has no effect at all. At some, it may cause a segfault. The problem occurs only during config phase, no segfault happens when rsyslog has fully started.
| | * | Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-191-2/+2
| | |\ \
| | * \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-191-5/+0
| | |\ \ \
| | * \ \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-172-3/+5
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-161-8/+2
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-111-1/+1
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-041-6/+0
| | |\ \ \ \ \ \ \
| * | | | | | | | | bugfix: imzmq3 segfault with PULL subscriptionMartin Nilsson2012-10-301-2/+4
| | | | | | | | | |
* | | | | | | | | | mmnormalize: support for v6+ config interface addedRainer Gerhards2012-11-011-29/+145
| | | | | | | | | |
* | | | | | | | | | mmjsonparse: support for v6+ config interface addedRainer Gerhards2012-11-011-5/+46
| | | | | | | | | |
* | | | | | | | | | bugfix: invalid rsyslog-internal macro API useRainer Gerhards2012-11-018-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This had no bad effect, because the macro did the same as the one that should have been used.
* | | | | | | | | | Merge branch 'master-ratelimit'Rainer Gerhards2012-10-3012-165/+139
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | remove legacy API parseAndSubmitMessage() from imrelpRainer Gerhards2012-10-291-3/+21
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into master-ratelimitRainer Gerhards2012-10-241-13/+18
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/v7compatibility.html
| * | | | | | | | | | | imuxsock: use a default ratelimiter if none else appliesRainer Gerhards2012-10-231-1/+9
| | | | | | | | | | | |
| * | | | | | | | | | | imklog, impstats: support for new rate-limiting API addedRainer Gerhards2012-10-192-6/+5
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into master-ratelimitRainer Gerhards2012-10-198-28/+30
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | | | | | | | | omruleset: update to new message submit APIs/ratelimiterRainer Gerhards2012-10-181-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... with the notable exception, that this module actualy needs no rate-limiter by design!
| * | | | | | | | | | | | Merge branch 'beta' into master-ratelimitRainer Gerhards2012-10-161-7/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | | | | | | | | | imtcp: support for Linux-Type ratelimiting addedRainer Gerhards2012-10-151-1/+12
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | imdiag: add support for new (ratelimiting) msg submit interfaceRainer Gerhards2012-10-151-3/+7
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | cosmetic: remove compiler warningRainer Gerhards2012-10-151-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | imudp: support for Linux-like ratelimiting addedRainer Gerhards2012-10-151-2/+14
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | imptcp: support for Linux-Type ratelimiting addedRainer Gerhards2012-10-151-1/+11
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | ratelimit: added linux-like ratelimiter typeRainer Gerhards2012-10-154-97/+24
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | milestone: convert imuxsock to ratelimitAddMsg() interfaceRainer Gerhards2012-10-151-30/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' into master-ratelimitRainer Gerhards2012-10-152-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/v7compatibility.html
| * | | | | | | | | | | | | | imfile: converted to new ratelimit interfaceRainer Gerhards2012-10-151-15/+7
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | ratelimit: imtcp (and gssapi) converted to new interfaceRainer Gerhards2012-10-151-4/+3
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | imudp: add input batching & ratelimiter interfaceRainer Gerhards2012-10-152-6/+12
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | ratelimiter: enable thread-safe mode & (related) API changesRainer Gerhards2012-10-154-9/+12
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | indicate no original code left in imudpRainer Gerhards2012-10-151-2/+0
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | interface cleanup (probably not final)Rainer Gerhards2012-10-156-7/+6
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | milestone: ratelimiter used in imptcpRainer Gerhards2012-10-152-12/+12
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | milestone: experimental rate limiter used in imuxsockRainer Gerhards2012-10-121-1/+13
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | new ratelimit: interface plumbing addedRainer Gerhards2012-10-097-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no actual implementation yet done
* | | | | | | | | | | | | | | move cJSON to omelasticsearchRainer Gerhards2012-10-2911-2/+1224
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the rsyslog runtime itself now uses json-c, but omelasticsearch currently depends on cJSON. We will change this, but not yet. Let's merge as is and see that it works well ;)
* | | | | | | | | | | | | | | Merge branch 'beta-jsonrt' into master-esRainer Gerhards2012-10-292-46/+221
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h