Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | queue: change generic msg ptr (pUsr) to be of msg_t type | Rainer Gerhards | 2012-11-03 | 4 | -62/+44 | |
| | | | | ||||||
* | | | | queue: change gerenic queue pUsr ptr to be action_t | Rainer Gerhards | 2012-11-03 | 3 | -7/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | this was always action_t, but the initial design was more generic. We are making it specific now in order to gain better performance (after all, we did not need the generic engine in the past 8 years...) | |||||
* | | | | generate disk .qi file once at queue construction | Rainer Gerhards | 2012-11-02 | 2 | -16/+13 | |
| | | | | | | | | | | | | | | | | | | | | ... instead of each time a file write happens. In some situations (very frequent sync), this can probably be a big performane win. | |||||
* | | | | Merge branch 'master-ratelimit' | Rainer Gerhards | 2012-10-30 | 10 | -13/+420 | |
|\ \ \ \ | ||||||
| * | | | | 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 'master' into master-ratelimit | Rainer Gerhards | 2012-10-23 | 1 | -1/+1 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | |||||
| * | | | | | | 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 | |||||
| * | | | | | | | 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 | |||||
| * | | | | | | | | 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 | |||||
* | | | | | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-10-30 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html | |||||
| * | | | | | | | | testbench: complex1.sh testcase failed on slower machines | Rainer Gerhards | 2012-10-29 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... due to too small timeout for enqueue processing --> messages got lost | |||||
* | | | | | | | | | move cJSON to omelasticsearch | Rainer Gerhards | 2012-10-29 | 10 | -1225/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 11 | -2/+1226 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h | |||||
| * | | | | | | | | | omelasticsearch: parse JSON response (in regard to data errors) | Rainer Gerhards | 2012-07-25 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-27 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | / / / | |_|_|_|_|_|/ / / |/| | | | | | | | | ||||||
| * | | | | | | | | Improve syntax error messages by outputting the error token | Rainer Gerhards | 2012-10-27 | 1 | -1/+2 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-10-24 | 1 | -2/+0 | |
|\| | | | | | | | | |_|_|_|_|/ / / |/| | | | | | | | ||||||
| * | | | | | | | cleanup | Rainer Gerhards | 2012-10-24 | 1 | -2/+0 | |
| | | | | | | | | ||||||
* | | | | | | | | 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. | |||||
* | | | | | | | | 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 |