| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | | | | | | 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 | |||||
| | * | | | | | | | | | | | 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 | 3 | -14/+113 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | 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 | 3 | -38/+67 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | note: bulkmode response processing is still mostly missing | |||||
| | * | | | | | | | | | | | add cJSON to rsyslog runtime | Rainer Gerhards | 2012-07-25 | 10 | -2/+1225 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-10-29 | 2 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | bugfix: ruleset()-object did only support a single statement | Rainer Gerhards | 2012-10-27 | 2 | -1/+2 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-10-27 | 5 | -4/+18 | |
| |\| | | | | | | | | | | | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | add -D rsyslogd option to enable config parser debug mode | Rainer Gerhards | 2012-10-27 | 3 | -1/+14 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Improve syntax error messages by outputting the error token | Rainer Gerhards | 2012-10-27 | 2 | -1/+3 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-10-25 | 1 | -2/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | ||||||
| | | * | | | | | | | | | doc: fix html formatting | Michael Biebl | 2012-10-25 | 1 | -2/+1 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-10-24 | 6 | -17/+38 | |
| |\| | | | | | | | | | | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | ||||||
| | * | | | | | | | | | cleanup | Rainer Gerhards | 2012-10-24 | 2 | -3/+1 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | make rsyslog core suspened actions after 10 failures in a row | Rainer Gerhards | 2012-10-24 | 3 | -1/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was former the case after 1,000 failures and could cause rsyslog to be spammed/ressou | |||||
| | * | | | | | | | | | ommongodb rate-limits error messages to prevent spamming the syslog | Rainer Gerhards | 2012-10-24 | 2 | -13/+22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes (for v7.2): http://bugzilla.adiscon.com/show_bug.cgi?id=366 | |||||
| * | | | | | | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-10-23 | 4 | -8/+17 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | |||||
| | * | | | | | | | | | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-10-22 | 2 | -5/+11 | |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html template.c | |||||
| | | * | | | | | | | | preparing for 6.6.0v6.6.0 | Rainer Gerhards | 2012-10-22 | 5 | -7/+10 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | Merge branch 'v6-beta' into v6-stable | Rainer Gerhards | 2012-10-22 | 88 | -935/+7279 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-19 | 2 | -4/+4 | |
| | | | |\ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | doc: add imported bugfix to ChangeLog | Rainer Gerhards | 2012-10-19 | 1 | -0/+3 | |
| | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-19 | 2 | -5/+1 | |
| | | | |\ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-17 | 6 | -45/+22 | |
| | | | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-16 | 2 | -9/+11 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-11 | 2 | -1/+7 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | preparing for 6.5.1 releasev6.5.1 | Rainer Gerhards | 2012-10-11 | 3 | -3/+3 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | prepare for 7.20 stable release & minor thingsv7.2.0 | Rainer Gerhards | 2012-10-22 | 5 | -5/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The most important real code chane is the initialization of the epoll control set. This should just be cosmetic (valgrind warnings), as all data we actually use already was properly initialized. | |||||
| | * | | | | | | | | | | | | | | | testbench: -c option no longer exists | Rainer Gerhards | 2012-10-22 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | bugfix: segfault on startup when modules using MSG_PASSING mode are used | Rainer Gerhards | 2012-10-23 | 2 | -1/+5 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge branch 'beta-newgrammar' | Rainer Gerhards | 2012-10-22 | 2 | -3/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | |||||
| | * | | | | | | | | | | | | | | | | permit action-like statements (stop, call, ...) in action lists | Rainer Gerhards | 2012-10-22 | 2 | -3/+5 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | re-enable deprecated warings for omdiscard/omruleset | Rainer Gerhards | 2012-10-22 | 2 | -8/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge for action list functionality will follow soon | |||||
| * | | | | | | | | | | | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-22 | 4 | -9/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | disable deprecated warnings in omdiscard/omruleset | Rainer Gerhards | 2012-10-22 | 2 | -0/+8 | |
| | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... because action-like statements in action lists are not supported in 7.1. This will be available in 7.3, but it is too late to do this in 7.1. So we disable the warnings and re-enable them in 7.3. Functionality- wise, this is no problem at all as the legacy constructs are still fully supported. Thanks to forum user "canadaboy" for mentioning this problem. | |||||
| | * | | | | | | | | | | | | | doc: remove BSD blocks from rsyslog.conf manpage | Rainer Gerhards | 2012-10-22 | 1 | -8/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for mentioning this. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=364 | |||||
| | * | | | | | | | | | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-22 | 1 | -1/+1 | |
| | |\| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | Merge branch 'v5-stable' into v6-stablev6.4.3.unfinished | Rainer Gerhards | 2012-10-22 | 1 | -1/+1 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | / | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | ||||||
 |
index : rsyslog | |
| Modifications to rsyslog---see v3-stable-kaz branch | kaz@kylheku.com |
| summaryrefslogtreecommitdiffstats |