Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | bugfix: invalid rsyslog-internal macro API use | Rainer Gerhards | 2012-11-01 | 10 | -10/+10 |
| | | | | | This had no bad effect, because the macro did the same as the one that should have been used. | ||||
* | prepare for 7.3.2 releasev7.3.2 | Rainer Gerhards | 2012-10-30 | 3 | -3/+11 |
| | |||||
* | Merge branch 'master-ratelimit' | Rainer Gerhards | 2012-10-30 | 35 | -471/+720 |
|\ | |||||
| * | remove legacy API parseAndSubmitMessage() from imrelp | Rainer Gerhards | 2012-10-29 | 1 | -3/+21 |
| | | |||||
| * | nit: correct invalid error code | Rainer Gerhards | 2012-10-24 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-24 | 7 | -19/+38 |
| |\ | | | | | | | | | | | | | Conflicts: doc/v7compatibility.html | ||||
| * | | rate-limit rsyslog internal messages | Rainer Gerhards | 2012-10-23 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | a special ratelimiter is used; it's linux-type ratelimit settings are currently hardcoded | ||||
| * | | imuxsock: use a default ratelimiter if none else applies | Rainer Gerhards | 2012-10-23 | 1 | -1/+9 |
| | | | |||||
| * | | Merge branch 'tmp-ratelimit' into master-ratelimit | Rainer Gerhards | 2012-10-23 | 5 | -13/+25 |
| |\ \ | |||||
| | * \ | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-23 | 5 | -13/+25 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | | nit: valgrind-testaid was accidentely enabled in testbench | Rainer Gerhards | 2012-10-23 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | remove "last message repeated n times" from rsyslog output part | Rainer Gerhards | 2012-10-23 | 7 | -232/+26 |
| | | | | |||||
| * | | | Merge branch 'beta' into master-ratelimit | Rainer Gerhards | 2012-10-22 | 2 | -9/+2 |
| |\ \ \ | |||||
| * | | | | ratelimit: add default ratelimiter | Rainer Gerhards | 2012-10-19 | 1 | -4/+14 |
| | | | | | |||||
| * | | | | cleanup | Rainer Gerhards | 2012-10-19 | 1 | -38/+0 |
| | | | | | |||||
| * | | | | 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 | 24 | -230/+282 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | | | cosmetic: get rid of compiler warning on currently unused debug code | Rainer Gerhards | 2012-10-19 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | 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 | 2 | -11/+22 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | | | | imtcp: support for Linux-Type ratelimiting added | Rainer Gerhards | 2012-10-15 | 5 | -6/+41 |
| | | | | | | | |||||
| * | | | | | | fix: memory leak in linux-like ratelimiter | Rainer Gerhards | 2012-10-15 | 1 | -1/+3 |
| | | | | | | | |||||
| * | | | | | | imdiag: add support for new (ratelimiting) msg submit interface | Rainer Gerhards | 2012-10-15 | 1 | -3/+7 |
| | | | | | | | |||||
| * | | | | | | fix: we need to use loadConf to access global settings | Rainer Gerhards | 2012-10-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hint: globals need to be re-done... | ||||
| * | | | | | | cosmetic: remove compiler warning | Rainer Gerhards | 2012-10-15 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | fix: linux-like ratelimiting did not emit "final" message... | Rainer Gerhards | 2012-10-15 | 1 | -7/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | on destruction of rate limiter. | ||||
| * | | | | | | imudp: support for Linux-like ratelimiting added | Rainer Gerhards | 2012-10-15 | 3 | -3/+24 |
| | | | | | | | |||||
| * | | | | | | remove debug code | Rainer Gerhards | 2012-10-15 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | went accidently into commit | ||||
| * | | | | | | imptcp: support for Linux-Type ratelimiting added | Rainer Gerhards | 2012-10-15 | 5 | -15/+22 |
| | | | | | | | |||||
| * | | | | | | ratelimit: added linux-like ratelimiter type | Rainer Gerhards | 2012-10-15 | 9 | -110/+143 |
| | | | | | | | |||||
| * | | | | | | ratelimit: respect $repeatedmsgreduction setting | Rainer Gerhards | 2012-10-15 | 2 | -26/+49 |
| | | | | | | | |||||
| * | | | | | | milestone: convert imuxsock to ratelimitAddMsg() interface | Rainer Gerhards | 2012-10-15 | 2 | -33/+6 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-15 | 15 | -24/+117 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 4 | -17/+10 |
| | | | | | | | | |||||
| * | | | | | | | imudp: add input batching & ratelimiter interface | Rainer Gerhards | 2012-10-15 | 5 | -6/+17 |
| | | | | | | | | |||||
| * | | | | | | | ratelimiter: enable thread-safe mode & (related) API changes | Rainer Gerhards | 2012-10-15 | 9 | -105/+101 |
| | | | | | | | | |||||
| * | | | | | | | Change debug output defaults to match current needs | Rainer Gerhards | 2012-10-15 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | 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 | 10 | -25/+24 |
| | | | | | | | | |||||
| * | | | | | | | milestone: ratelimiter used in imptcp | Rainer Gerhards | 2012-10-15 | 6 | -26/+111 |
| | | | | | | | | |||||
| * | | | | | | | milestone: experimental rate limiter used in imuxsock | Rainer Gerhards | 2012-10-12 | 5 | -1/+169 |
| | | | | | | | | |||||
| * | | | | | | | new ratelimit: interface plumbing added | Rainer Gerhards | 2012-10-09 | 14 | -20/+127 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no actual implementation yet done | ||||
* | | | | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-10-30 | 11 | -4/+155 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html | ||||
| * | | | | | | | | bugfix: omfwd did not properly support "template" parameter | Rainer Gerhards | 2012-10-30 | 7 | -3/+110 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We also added a testbench test to check for this in the future. That in turn required new testbench tools. | ||||
| * | | | | | | | | testbench: complex1.sh testcase failed on slower machines | Rainer Gerhards | 2012-10-29 | 2 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... due to too small timeout for enqueue processing --> messages got lost | ||||
| * | | | | | | | | prepare for 7.2.1 releasev7.2.1 | Rainer Gerhards | 2012-10-29 | 3 | -3/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | testbench: add test for ruleset() and call statements | Rainer Gerhards | 2012-10-29 | 3 | -0/+38 |
| | | | | | | | | | |||||
* | | | | | | | | | move cJSON to omelasticsearch | Rainer Gerhards | 2012-10-29 | 13 | -7/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 15 | -49/+1450 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h |