summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master-ratelimit'Rainer Gerhards2012-10-3010-13/+420
|\
| * nit: correct invalid error codeRainer Gerhards2012-10-241-1/+1
| |
| * Merge branch 'master' into master-ratelimitRainer Gerhards2012-10-242-4/+0
| |\ | | | | | | | | | | | | Conflicts: doc/v7compatibility.html
| * \ Merge branch 'master' into master-ratelimitRainer Gerhards2012-10-231-1/+1
| |\ \ | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | remove "last message repeated n times" from rsyslog output partRainer Gerhards2012-10-231-7/+2
| | | |
| * | | Merge branch 'master' into master-ratelimitRainer Gerhards2012-10-194-46/+59
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | cosmetic: get rid of compiler warning on currently unused debug codeRainer Gerhards2012-10-191-1/+1
| | | | |
| * | | | fix: memory leak in linux-like ratelimiterRainer Gerhards2012-10-151-1/+3
| | | | |
| * | | | fix: we need to use loadConf to access global settingsRainer Gerhards2012-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | Hint: globals need to be re-done...
| * | | | fix: linux-like ratelimiting did not emit "final" message...Rainer Gerhards2012-10-151-7/+17
| | | | | | | | | | | | | | | | | | | | on destruction of rate limiter.
| * | | | remove debug codeRainer Gerhards2012-10-151-3/+0
| | | | | | | | | | | | | | | | | | | | went accidently into commit
| * | | | imptcp: support for Linux-Type ratelimiting addedRainer Gerhards2012-10-152-7/+2
| | | | |
| * | | | ratelimit: added linux-like ratelimiter typeRainer Gerhards2012-10-153-11/+118
| | | | |
| * | | | ratelimit: respect $repeatedmsgreduction settingRainer Gerhards2012-10-152-26/+49
| | | | |
| * | | | milestone: convert imuxsock to ratelimitAddMsg() interfaceRainer Gerhards2012-10-151-3/+5
| | | | |
| * | | | Merge branch 'master' into master-ratelimitRainer Gerhards2012-10-154-8/+16
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/v7compatibility.html
| * | | | | imudp: add input batching & ratelimiter interfaceRainer Gerhards2012-10-152-0/+2
| | | | | |
| * | | | | ratelimiter: enable thread-safe mode & (related) API changesRainer Gerhards2012-10-153-63/+88
| | | | | |
| * | | | | Change debug output defaults to match current needsRainer Gerhards2012-10-151-2/+2
| | | | | |
| * | | | | interface cleanup (probably not final)Rainer Gerhards2012-10-151-1/+1
| | | | | |
| * | | | | milestone: ratelimiter used in imptcpRainer Gerhards2012-10-151-12/+37
| | | | | |
| * | | | | milestone: experimental rate limiter used in imuxsockRainer Gerhards2012-10-123-0/+134
| | | | | |
| * | | | | new ratelimit: interface plumbing addedRainer Gerhards2012-10-094-0/+92
| | | | | | | | | | | | | | | | | | | | | | | | no actual implementation yet done
* | | | | | Merge branch 'v7-stable'Rainer Gerhards2012-10-301-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html
| * | | | | | testbench: complex1.sh testcase failed on slower machinesRainer Gerhards2012-10-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ... due to too small timeout for enqueue processing --> messages got lost
* | | | | | | move cJSON to omelasticsearchRainer Gerhards2012-10-2910-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-esRainer Gerhards2012-10-2911-2/+1226
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h
| * | | | | | | omelasticsearch: parse JSON response (in regard to data errors)Rainer Gerhards2012-07-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | note: bulkmode response processing is still mostly missing
| * | | | | | | add cJSON to rsyslog runtimeRainer Gerhards2012-07-2510-2/+1225
| | | | | | | |
* | | | | | | | Merge branch 'v7-stable'Rainer Gerhards2012-10-271-1/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Improve syntax error messages by outputting the error tokenRainer Gerhards2012-10-271-1/+2
| | | | | | |
* | | | | | | Merge branch 'v7-stable'Rainer Gerhards2012-10-241-2/+0
|\| | | | | | | |_|_|_|_|/ |/| | | | |
| * | | | | cleanupRainer Gerhards2012-10-241-2/+0
| | | | | |
* | | | | | Merge branch 'v7-stable'Rainer Gerhards2012-10-231-1/+1
|\| | | | | | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-10-221-3/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html template.c
| | * | | | preparing for 6.6.0v6.6.0Rainer Gerhards2012-10-221-1/+1
| | | | | |
| | * | | | Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-191-2/+2
| | |\ \ \ \
| * | | | | | prepare for 7.20 stable release & minor thingsv7.2.0Rainer Gerhards2012-10-221-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 Gerhards2012-10-191-2/+2
|\| | | | | |
| * | | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-191-2/+2
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-191-2/+2
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/nsdpoll_ptcp.c
| | | * | | | | fix epoll-enabled code to use correct data member for pointersRainer Gerhards2012-10-191-2/+2
| | | | | | | |
* | | | | | | | Merge branch 'master-newtemplate'Rainer Gerhards2012-10-183-44/+57
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Fix crash when date properties are used without a templateMiloslav Trmač2012-10-111-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 processingRainer Gerhards2012-10-111-4/+2
| | | | | | | |
| * | | | | | | fix: wrong variable was populated in MsgGetProp()Rainer Gerhards2012-10-111-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | problem in this morning's change, never released
| * | | | | | | Merge branch 'master' into master-newtemplateRainer Gerhards2012-10-111-3/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: template.c
| * | | | | | | | slightly improve performance for $NOW family of system propertiesRainer Gerhards2012-10-111-17/+32
| | | | | | | | |
| * | | | | | | | refactor tpl processor so that date is queried once per templateRainer Gerhards2012-10-103-24/+24
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Things like $YEAR, $MONTH required a time() call each.
* | | | | | | | Merge branch 'beta'Rainer Gerhards2012-10-111-2/+11
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-15 18:24:25 +0000