summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| * | input stmt: add core engine plumbingRainer Gerhards2012-09-265-1/+96
| | |
* | | Merge branch 'v6-devel'Rainer Gerhards2012-09-261-1/+0
|\| |
| * | minor cleanupRainer Gerhards2012-09-251-1/+0
| | |
* | | fix invalid state handling during action executionRainer Gerhards2012-09-251-2/+2
| | | | | | | | | | | | could lead to execution of not-to-be-executed action. very recent regression.
* | | Merge branch 'master' into master-newrulesetRainer Gerhards2012-09-252-3/+4
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: runtime/modules.c
| * | | fix invalid free caused by optimized script executionRainer Gerhards2012-09-253-2/+5
| | | |
* | | | cosmetic: remove no-longer valid TODO itemRainer Gerhards2012-09-251-1/+0
| | | |
* | | | fix optimizer-introduced memleak in action destructionRainer Gerhards2012-09-251-61/+63
| | | |
* | | | cleanup & better debug outputRainer Gerhards2012-09-241-4/+4
| | | | | | | | | | | | | | | | | | | | - removed no longer needed function - debug log now contains action type for action objects
* | | | PoC: optimize omdicard --> STOPRainer Gerhards2012-09-242-1/+5
|/ / /
* | | Merge branch 'v6-devel' into master-newrulesetRainer Gerhards2012-09-231-7/+0
|\| |
| * | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-231-7/+0
| |\ \ | | | | | | | | | | | | | | | | Conflicts: runtime/glbl.c
| | * | Remove no longer needed functionRainer Gerhards2012-09-231-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | Thanks to Andreas Stieger from Novell/SUSE for alerting us. This function was introduced as part of the new config system, but never was actually used (aka "not needed").
* | | | fix compile problem due to error in last commitRainer Gerhards2012-09-211-1/+0
| | | |
* | | | Implement script optimization IF -> PRIFILTRainer Gerhards2012-09-211-10/+22
| | | |
* | | | Add skeleton for RainerScript optimizerRainer Gerhards2012-09-203-0/+39
| | | | | | | | | | | | | | | | actual optimization is not yet done
* | | | Merge branch 'v6-devel' into master-newrulesetRainer Gerhards2012-09-201-1/+1
|\| | |
| * | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-201-1/+1
| |\| |
| | * | SimplifyRainer Gerhards2012-09-201-4/+1
| | | |