Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-02 | 1 | -3/+3 |
|\ | |||||
| * | bugfix: potential abort of imtcp on rsyslogd shutdown | Rainer Gerhards | 2012-11-02 | 1 | -3/+3 |
| | | |||||
| * | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-11-01 | 8 | -8/+8 |
| |\ | |||||
| | * | bugfix: invalid rsyslog-internal macro API use | Rainer Gerhards | 2012-11-01 | 8 | -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 Gerhards | 2012-11-01 | 2 | -3/+5 |
|\| | | |||||
| * | | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-11-01 | 1 | -1/+1 |
| |\| | |||||
| | * | bugfix: misaddressing of $mmnormalizeuserawmsg parameter | Rainer Gerhards | 2012-11-01 | 1 | -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-beta | Rainer Gerhards | 2012-10-19 | 1 | -2/+2 |
| | |\ | |||||
| | * \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-19 | 1 | -5/+0 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-17 | 2 | -3/+5 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-16 | 1 | -8/+2 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-10-04 | 1 | -6/+0 |
| | |\ \ \ \ \ \ | |||||
| * | | | | | | | | bugfix: imzmq3 segfault with PULL subscription | Martin Nilsson | 2012-10-30 | 1 | -2/+4 |
| | | | | | | | | | |||||
* | | | | | | | | | mmnormalize: support for v6+ config interface added | Rainer Gerhards | 2012-11-01 | 1 | -29/+145 |
| | | | | | | | | | |||||
* | | | | | | | | | mmjsonparse: support for v6+ config interface added | Rainer Gerhards | 2012-11-01 | 1 | -5/+46 |
| | | | | | | | | | |||||
* | | | | | | | | | bugfix: invalid rsyslog-internal macro API use | Rainer Gerhards | 2012-11-01 | 8 | -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 Gerhards | 2012-10-30 | 12 | -165/+139 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | remove legacy API parseAndSubmitMessage() from imrelp | Rainer Gerhards | 2012-10-29 | 1 | -3/+21 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-24 | 1 | -13/+18 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/v7compatibility.html | ||||
| * | | | | | | | | | | imuxsock: use a default ratelimiter if none else applies | Rainer Gerhards | 2012-10-23 | 1 | -1/+9 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | imklog, impstats: support for new rate-limiting API added | Rainer Gerhards | 2012-10-19 | 2 | -6/+5 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-19 | 8 | -28/+30 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | | | | | | | | | omruleset: update to new message submit APIs/ratelimiter | Rainer Gerhards | 2012-10-18 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... with the notable exception, that this module actualy needs no rate-limiter by design! | ||||
| * | | | | | | | | | | | Merge branch 'beta' into master-ratelimit | Rainer Gerhards | 2012-10-16 | 1 | -7/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | | | | | | | | | | imtcp: support for Linux-Type ratelimiting added | Rainer Gerhards | 2012-10-15 | 1 | -1/+12 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | imdiag: add support for new (ratelimiting) msg submit interface | Rainer Gerhards | 2012-10-15 | 1 | -3/+7 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | cosmetic: remove compiler warning | Rainer Gerhards | 2012-10-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | imudp: support for Linux-like ratelimiting added | Rainer Gerhards | 2012-10-15 | 1 | -2/+14 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | imptcp: support for Linux-Type ratelimiting added | Rainer Gerhards | 2012-10-15 | 1 | -1/+11 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | ratelimit: added linux-like ratelimiter type | Rainer Gerhards | 2012-10-15 | 4 | -97/+24 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | milestone: convert imuxsock to ratelimitAddMsg() interface | Rainer Gerhards | 2012-10-15 | 1 | -30/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-15 | 2 | -1/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/v7compatibility.html | ||||
| * | | | | | | | | | | | | | imfile: converted to new ratelimit interface | Rainer Gerhards | 2012-10-15 | 1 | -15/+7 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | ratelimit: imtcp (and gssapi) converted to new interface | Rainer Gerhards | 2012-10-15 | 1 | -4/+3 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | imudp: add input batching & ratelimiter interface | Rainer Gerhards | 2012-10-15 | 2 | -6/+12 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | ratelimiter: enable thread-safe mode & (related) API changes | Rainer Gerhards | 2012-10-15 | 4 | -9/+12 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | indicate no original code left in imudp | Rainer Gerhards | 2012-10-15 | 1 | -2/+0 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | interface cleanup (probably not final) | Rainer Gerhards | 2012-10-15 | 6 | -7/+6 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | milestone: ratelimiter used in imptcp | Rainer Gerhards | 2012-10-15 | 2 | -12/+12 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | milestone: experimental rate limiter used in imuxsock | Rainer Gerhards | 2012-10-12 | 1 | -1/+13 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | new ratelimit: interface plumbing added | Rainer Gerhards | 2012-10-09 | 7 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no actual implementation yet done | ||||
* | | | | | | | | | | | | | | move cJSON to omelasticsearch | Rainer Gerhards | 2012-10-29 | 11 | -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-es | Rainer Gerhards | 2012-10-29 | 2 | -46/+221 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h | ||||
| * | | | | | | | | | | | | | omelasticsearch: improved debug logging | Rainer Gerhards | 2012-07-30 | 1 | -2/+5 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | omelasticsearch: support for writing data errors to local file added | Rainer Gerhards | 2012-07-30 | 2 | -14/+112 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | omelasticsearch: mileston: bulk reply is parsed | Rainer Gerhards | 2012-07-30 | 1 | -2/+48 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | omelasticsearch: parse JSON response (in regard to data errors) | Rainer Gerhards | 2012-07-25 | 1 | -37/+65 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | note: bulkmode response processing is still mostly missing | ||||
* | | | | | | | | | | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-10-24 | 1 | -13/+18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | ommongodb rate-limits error messages to prevent spamming the syslog | Rainer Gerhards | 2012-10-24 | 1 | -13/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes (for v7.2): http://bugzilla.adiscon.com/show_bug.cgi?id=366 |