Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. | ||||
* | | | 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 |
| | | | |||||
* | | | 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. | ||||
* | | | add "parser" parameter to ruleset(), so that parser chain can be configured | Rainer Gerhards | 2012-10-02 | 3 | -8/+33 |
| | | | |||||
* | | | mmjsonparse: also add MSG part of message if CEE-parsing fails | Rainer Gerhards | 2012-10-02 | 1 | -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 ruleset | Rainer Gerhards | 2012-10-01 | 3 | -5/+10 |
| | | | | | | | | | | | | | | | much like the $ruleset legacy conf statement. This potentially lead to statements being assigned to the wrong ruleset. | ||||
* | | | implement RainerScript "call" statement | Rainer Gerhards | 2012-10-01 | 1 | -0/+5 |
| | | | |||||
* | | | cleanup | Rainer Gerhards | 2012-10-01 | 1 | -1/+0 |
| | | | |||||
* | | | implement string arrays for config objects | Rainer Gerhards | 2012-10-01 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | as a tester, imudp now supports binding to multiple options based on a string array | ||||
* | | | Implement RainerScript ruleset() statement | Rainer Gerhards | 2012-09-28 | 4 | -3/+59 |
| | | | |||||
* | | | somewhat better debug output | Rainer Gerhards | 2012-09-28 | 1 | -1/+3 |
| | | | |||||
* | | | cleanup | Rainer Gerhards | 2012-09-28 | 1 | -5/+1 |
| | | | | | | | | | | | | | | | recent enhancement in RainerScript param handlers permit to remove now-redundant code | ||||
* | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-27 | 6 | -13/+151 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c grammar/grammar.y runtime/modules.h runtime/rsconf.c | ||||
| * | | Do not load module if it had errorneous parameters | Rainer Gerhards | 2012-09-27 | 3 | -12/+58 |
| | | | |||||
| * | | bugfix: config errors did not always cause statement to fail | Rainer Gerhards | 2012-09-27 | 1 | -0/+2 |
| | | | | | | | | | | | | This could lead to startup with invalid parameters. | ||||
| * | | cleanup | Rainer Gerhards | 2012-09-26 | 1 | -2/+0 |
| | | | |||||
| * | | cleanup | Rainer Gerhards | 2012-09-26 | 1 | -3/+0 |
| | | | |||||
| * | | input stmt: add core engine plumbing | Rainer Gerhards | 2012-09-26 | 5 | -1/+96 |
| | | | |||||
* | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-26 | 1 | -1/+0 |
|\| | | |||||
| * | | minor cleanup | Rainer Gerhards | 2012-09-25 | 1 | -1/+0 |
| | | | |||||
* | | | fix invalid state handling during action execution | Rainer Gerhards | 2012-09-25 | 1 | -2/+2 |
| | | | | | | | | | | | | could lead to execution of not-to-be-executed action. very recent regression. | ||||
* | | | Merge branch 'master' into master-newruleset | Rainer Gerhards | 2012-09-25 | 2 | -3/+4 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: runtime/modules.c | ||||
| * | | | fix invalid free caused by optimized script execution | Rainer Gerhards | 2012-09-25 | 3 | -2/+5 |
| | | | | |||||
* | | | | cosmetic: remove no-longer valid TODO item | Rainer Gerhards | 2012-09-25 | 1 | -1/+0 |
| | | | | |||||
* | | | | fix optimizer-introduced memleak in action destruction | Rainer Gerhards | 2012-09-25 | 1 | -61/+63 |
| | | | | |||||
* | | | | cleanup & better debug output | Rainer Gerhards | 2012-09-24 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | - removed no longer needed function - debug log now contains action type for action objects | ||||
* | | | | PoC: optimize omdicard --> STOP | Rainer Gerhards | 2012-09-24 | 2 | -1/+5 |
|/ / / | |||||
* | | | Merge branch 'v6-devel' into master-newruleset | Rainer Gerhards | 2012-09-23 | 1 | -7/+0 |
|\| | | |||||
| * | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-23 | 1 | -7/+0 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: runtime/glbl.c | ||||
| | * | | Remove no longer needed function | Rainer Gerhards | 2012-09-23 | 1 | -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 commit | Rainer Gerhards | 2012-09-21 | 1 | -1/+0 |
| | | | | |||||
* | | | | Implement script optimization IF -> PRIFILT | Rainer Gerhards | 2012-09-21 | 1 | -10/+22 |
| | | | | |||||
* | | | | Add skeleton for RainerScript optimizer | Rainer Gerhards | 2012-09-20 | 3 | -0/+39 |
| | | | | | | | | | | | | | | | | actual optimization is not yet done | ||||
* | | | | Merge branch 'v6-devel' into master-newruleset | Rainer Gerhards | 2012-09-20 | 1 | -1/+1 |
|\| | | | |||||
| * | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-20 | 1 | -1/+1 |
| |\| | | |||||
| | * | | Simplify | Rainer Gerhards | 2012-09-20 | 1 | -4/+1 |
| | | | |