Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-19 | 4 | -46/+59 |
|\ | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | Merge branch 'beta' | Rainer Gerhards | 2012-10-19 | 1 | -2/+2 |
| |\ | |||||
| | * | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-19 | 1 | -2/+2 |
| | |\ | |||||
| | | * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-19 | 1 | -2/+2 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/nsdpoll_ptcp.c | ||||
| | | | * | fix epoll-enabled code to use correct data member for pointers | Rainer Gerhards | 2012-10-19 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge branch 'master-newtemplate' | Rainer Gerhards | 2012-10-18 | 3 | -44/+57 |
| |\ \ \ \ | |||||
| | * | | | | Fix crash when date properties are used without a template | Miloslav Trmač | 2012-10-11 | 1 | -2/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | E.g. in > set $!time = $timereported; > set $!time_rcvd = $timegenerated; pTpe is set to NULL by the caller. (Is "default" the correct format to use?) Signed-off-by: Miloslav Trmač <mitr@redhat.com> | ||||
| | * | | | | optimize property replacer: reduce runtime for simple processing | Rainer Gerhards | 2012-10-11 | 1 | -4/+2 |
| | | | | | | |||||
| | * | | | | fix: wrong variable was populated in MsgGetProp() | Rainer Gerhards | 2012-10-11 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | problem in this morning's change, never released | ||||
| | * | | | | Merge branch 'master' into master-newtemplate | Rainer Gerhards | 2012-10-11 | 1 | -3/+3 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: template.c | ||||
| | * | | | | | slightly improve performance for $NOW family of system properties | Rainer Gerhards | 2012-10-11 | 1 | -17/+32 |
| | | | | | | | |||||
| | * | | | | | refactor tpl processor so that date is queried once per template | Rainer Gerhards | 2012-10-10 | 3 | -24/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Things like $YEAR, $MONTH required a time() call each. | ||||
* | | | | | | | cosmetic: get rid of compiler warning on currently unused debug code | Rainer Gerhards | 2012-10-19 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | fix: memory leak in linux-like ratelimiter | Rainer Gerhards | 2012-10-15 | 1 | -1/+3 |
| | | | | | | | |||||
* | | | | | | | 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... | ||||
* | | | | | | | fix: linux-like ratelimiting did not emit "final" message... | Rainer Gerhards | 2012-10-15 | 1 | -7/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | on destruction of rate limiter. | ||||
* | | | | | | | 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 | 2 | -7/+2 |
| | | | | | | | |||||
* | | | | | | | ratelimit: added linux-like ratelimiter type | Rainer Gerhards | 2012-10-15 | 3 | -11/+118 |
| | | | | | | | |||||
* | | | | | | | ratelimit: respect $repeatedmsgreduction setting | Rainer Gerhards | 2012-10-15 | 2 | -26/+49 |
| | | | | | | | |||||
* | | | | | | | milestone: convert imuxsock to ratelimitAddMsg() interface | Rainer Gerhards | 2012-10-15 | 1 | -3/+5 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-15 | 4 | -8/+16 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/v7compatibility.html | ||||
| * | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-11 | 1 | -2/+11 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | Fix crash when date properties are used without a template | Miloslav Trmač | 2012-10-11 | 1 | -2/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | E.g. in > set $!time = $timereported; > set $!time_rcvd = $timegenerated; pTpe is set to NULL by the caller. (Is "default" the correct format to use?) Signed-off-by: Miloslav Trmač <mitr@redhat.com> | ||||
| * | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-11 | 2 | -3/+2 |
| |\| | | | | | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | | | added deprecated note to omruleset | Rainer Gerhards | 2012-10-11 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | cosmetic: simplify | Rainer Gerhards | 2012-10-11 | 1 | -3/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-10-11 | 1 | -3/+3 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | Conflicts: template.c | ||||
| | * | | | | re-enabled commented-out serialization support in debug handler | Rainer Gerhards | 2012-10-11 | 1 | -3/+3 |
| | | | | | | |||||
* | | | | | | imudp: add input batching & ratelimiter interface | Rainer Gerhards | 2012-10-15 | 2 | -0/+2 |
| | | | | | | |||||
* | | | | | | ratelimiter: enable thread-safe mode & (related) API changes | Rainer Gerhards | 2012-10-15 | 3 | -63/+88 |
| | | | | | | |||||
* | | | | | | Change debug output defaults to match current needs | Rainer Gerhards | 2012-10-15 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | interface cleanup (probably not final) | Rainer Gerhards | 2012-10-15 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | milestone: ratelimiter used in imptcp | Rainer Gerhards | 2012-10-15 | 1 | -12/+37 |
| | | | | | | |||||
* | | | | | | milestone: experimental rate limiter used in imuxsock | Rainer Gerhards | 2012-10-12 | 3 | -0/+134 |
| | | | | | | |||||
* | | | | | | new ratelimit: interface plumbing added | Rainer Gerhards | 2012-10-09 | 4 | -0/+92 |
|/ / / / / | | | | | | | | | | | | | | | | no actual implementation yet done | ||||
* | | | | | fix compile problem with DEBUG instrumentation enabled | Rainer Gerhards | 2012-10-08 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | Merge branch 'c1-streamzip' into master-streamzip | Rainer Gerhards | 2012-10-05 | 2 | -48/+100 |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/rsyslog_conf_global.html runtime/stream.c tools/omfile.c | ||||
| * | | | | improved omfile zip writer to increase compression | Rainer Gerhards | 2012-09-14 | 2 | -50/+100 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This was achieved by somewhat reducing the robustness of the zip archive. This is controlled by the new setting $OMFileVeryReliableZip. | ||||
* | | | | | add "parser" parameter to ruleset(), so that parser chain can be configured | Rainer Gerhards | 2012-10-02 | 3 | -8/+33 |
| | | | | | |||||
* | | | | | mmjsonparse: also add MSG part of message if CEE-parsing fails | Rainer Gerhards | 2012-10-02 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | | bugfix: ruleset(){} directive errornously changed default ruleset | Rainer Gerhards | 2012-10-01 | 3 | -5/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | much like the $ruleset legacy conf statement. This potentially lead to statements being assigned to the wrong ruleset. | ||||
* | | | | | implement RainerScript "call" statement | Rainer Gerhards | 2012-10-01 | 1 | -0/+5 |
| | | | | | |||||
* | | | | | cleanup | Rainer Gerhards | 2012-10-01 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | implement string arrays for config objects | Rainer Gerhards | 2012-10-01 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | as a tester, imudp now supports binding to multiple options based on a string array | ||||
* | | | | | Implement RainerScript ruleset() statement | Rainer Gerhards | 2012-09-28 | 4 | -3/+59 |
| | | | | | |||||
* | | | | | somewhat better debug output | Rainer Gerhards | 2012-09-28 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | cleanup | Rainer Gerhards | 2012-09-28 | 1 | -5/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | recent enhancement in RainerScript param handlers permit to remove now-redundant code | ||||
* | | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-27 | 6 | -13/+151 |
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c grammar/grammar.y runtime/modules.h runtime/rsconf.c | ||||
| * | | | | Do not load module if it had errorneous parameters | Rainer Gerhards | 2012-09-27 | 3 | -12/+58 |
| | | | | |