Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | nit: correct invalid error code | Rainer Gerhards | 2012-10-24 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-24 | 2 | -4/+0 |
|\ | | | | | | | | | Conflicts: doc/v7compatibility.html | ||||
| * | Merge branch 'v7-stable' | Rainer Gerhards | 2012-10-24 | 1 | -2/+0 |
| |\ | |||||
| | * | cleanup | Rainer Gerhards | 2012-10-24 | 1 | -2/+0 |
| | | | |||||
* | | | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-23 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-10-23 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-10-22 | 1 | -3/+3 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html template.c | ||||
| | | * | preparing for 6.6.0v6.6.0 | Rainer Gerhards | 2012-10-22 | 1 | -1/+1 |
| | | | | |||||
| | | * | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-19 | 1 | -2/+2 |
| | | |\ | |||||
| | * | | | prepare for 7.20 stable release & minor thingsv7.2.0 | Rainer Gerhards | 2012-10-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | | remove "last message repeated n times" from rsyslog output part | Rainer Gerhards | 2012-10-23 | 1 | -7/+2 |
| | | | | | |||||
* | | | | | 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. |