summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | 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>
* | | | | | | | Merge branch 'beta'Rainer Gerhards2012-10-112-3/+2
|\| | | | | | | | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | | added deprecated note to omrulesetRainer Gerhards2012-10-111-0/+1
| | | | | | |
| * | | | | | cosmetic: simplifyRainer Gerhards2012-10-111-3/+1
| | | | | | |
* | | | | | | Merge branch 'v6-devel'Rainer Gerhards2012-10-111-3/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | / / | | |_|_|/ / | |/| | | | Conflicts: template.c
| * | | | | re-enabled commented-out serialization support in debug handlerRainer Gerhards2012-10-111-3/+3
| | | | | |
* | | | | | fix compile problem with DEBUG instrumentation enabledRainer Gerhards2012-10-081-1/+0
| | | | | |
* | | | | | Merge branch 'c1-streamzip' into master-streamzipRainer Gerhards2012-10-052-48/+100
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/rsyslog_conf_global.html runtime/stream.c tools/omfile.c
| * | | | | improved omfile zip writer to increase compressionRainer Gerhards2012-09-142-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 configuredRainer Gerhards2012-10-023-8/+33
| | | | | |
* | | | | | mmjsonparse: also add MSG part of message if CEE-parsing failsRainer Gerhards2012-10-021-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 rulesetRainer Gerhards2012-10-013-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | much like the $ruleset legacy conf statement. This potentially lead to statements being assigned to the wrong ruleset.
* | | | | | implement RainerScript "call" statementRainer Gerhards2012-10-011-0/+5
| | | | | |
* | | | | | cleanupRainer Gerhards2012-10-011-1/+0
| | | | | |
* | | | | | implement string arrays for config objectsRainer Gerhards2012-10-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as a tester, imudp now supports binding to multiple options based on a string array
* | | | | | Implement RainerScript ruleset() statementRainer Gerhards2012-09-284-3/+59
| | | | | |
* | | | | | somewhat better debug outputRainer Gerhards2012-09-281-1/+3
| | | | | |
* | | | | | cleanupRainer Gerhards2012-09-281-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recent enhancement in RainerScript param handlers permit to remove now-redundant code
* | | | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-276-13/+151
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c grammar/grammar.y runtime/modules.h runtime/rsconf.c
| * | | | | Do not load module if it had errorneous parametersRainer Gerhards2012-09-273-12/+58
| | | | | |
| * | | | | bugfix: config errors did not always cause statement to failRainer Gerhards2012-09-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | This could lead to startup with invalid parameters.
| * | | | | cleanupRainer Gerhards2012-09-261-2/+0
| | | | | |
| * | | | | cleanupRainer Gerhards2012-09-261-3/+0
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-17 05:07:22 +0000