Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v6-stable' into master-newruleset | Rainer Gerhards | 2012-09-21 | 2 | -1/+5 |
|\ | | | | | | | | | Conflicts: grammar/lexer.l | ||||
| * | bugfix: some valid legacy PRI filters were flagged as errornous | Rainer Gerhards | 2012-09-21 | 2 | -1/+5 |
| | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=358 This happend to filters of the style "local0,local1.*", where the multiple facilities were comma-separated. | ||||
* | | 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 | 6 | -29/+115 |
| | | |||||
* | | bugfix: subtree-type template incorrectly handled | Rainer Gerhards | 2012-09-21 | 1 | -4/+9 |
| | | |||||
* | | Implement script optimizer basic constant folding & NOP removal | Rainer Gerhards | 2012-09-21 | 1 | -31/+164 |
| | | |||||
* | | Add skeleton for RainerScript optimizer | Rainer Gerhards | 2012-09-20 | 5 | -0/+123 |
| | | | | | | | | 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 |
| | | | |||||
| | * | Added missing iRet handler code into CheckConnection() in netstrm.c | Andre Lorbach | 2012-09-20 | 1 | -1/+4 |
| | | | |||||
* | | | Implement RainerScript prifield() function | Rainer Gerhards | 2012-09-20 | 7 | -3/+101 |
| | | | |||||
* | | | Add new tests to testbench | Rainer Gerhards | 2012-09-20 | 5 | -0/+63 |
| | | | |||||
* | | | Implement RainerScript field() function | Rainer Gerhards | 2012-09-20 | 8 | -8/+143 |
| | | | |||||
* | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-20 | 2 | -0/+8 |
|\| | | |||||
| * | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-20 | 2 | -0/+8 |
| |\| | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | doc: add last bugfix to ChangeLog | Rainer Gerhards | 2012-09-20 | 1 | -0/+5 |
| | | | |||||
| | * | Fix missing Sysklogd template | Milan Bartos | 2012-09-20 | 1 | -0/+3 |
| | | | | | | | | | | | | modified: runtime/rsconf.c | ||||
* | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-20 | 5 | -2/+16 |
|\| | | |||||
| * | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-20 | 2 | -1/+2 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | preparing for 6.4.2 releasev6.4.2 | Rainer Gerhards | 2012-09-20 | 4 | -3/+3 |
| | | | |||||
| | * | testbench: do not run tests requiring root privs if non-root | Rainer Gerhards | 2012-09-20 | 2 | -0/+8 |
| | | | |||||
| | * | bugfix: config validation run did not always return correct return state | Rainer Gerhards | 2012-09-20 | 2 | -0/+2 |
| | | | |||||
| * | | bugfix: config validation run did not always return correct return state | Rainer Gerhards | 2012-09-20 | 2 | -0/+2 |
| | | | |||||
| * | | testbench: do not run tests requiring root privs if non-root | Rainer Gerhards | 2012-09-20 | 2 | -0/+8 |
| | | | |||||
| * | | bugfix: small memory leak in imdiag | Rainer Gerhards | 2012-09-20 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | This does not have any practical problems associated with it, EXCECPT that it caused almost all valgrind testbench tests to fail. | ||||
| * | | doc: add new functions to RainerScript function list | Rainer Gerhards | 2012-09-20 | 1 | -1/+4 |
| | | | |||||
* | | | bugfix: invalid debug message for normal operation | Rainer Gerhards | 2012-09-19 | 1 | -1/+1 |
| | | | | | | | | | | | | had no effect except on debug log | ||||
* | | | bugfix: small memory leak in imdiag | Rainer Gerhards | 2012-09-19 | 4 | -0/+27 |
| | | | | | | | | | | | | | | | This does not have any practical problems associated with it, EXCECPT that it caused almost all valgrind testbench tests to fail. | ||||
* | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-19 | 3 | -2/+19 |
|\| | | |||||
| * | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-19 | 3 | -2/+19 |
| |\| | |||||
| | * | bugfix: potential abort, if action queue could not be properly started | Rainer Gerhards | 2012-09-19 | 3 | -2/+19 |
| | | | | | | | | | | | | This most importantly could happen due to configuration errors. | ||||
* | | | preparing for 7.1.4 releasev7.1.4 | Rainer Gerhards | 2012-09-19 | 5 | -11/+13 |
| | | | |||||
* | | | bugfix: debug output indicated improper queue type | Rainer Gerhards | 2012-09-19 | 2 | -0/+5 |
| | | | |||||
* | | | Add CEE test to testbench | Rainer Gerhards | 2012-09-19 | 3 | -0/+22 |
| | | | |||||
* | | | bugfix: omfile action did not respect "template" parameter | Rainer Gerhards | 2012-09-19 | 2 | -1/+5 |
| | | | | | | | | | | | | ... and used default template in all cases | ||||
* | | | Implement ability for CEE-based properties to be stored in disk queues | Rainer Gerhards | 2012-09-19 | 3 | -2/+23 |
| | | | |||||
* | | | doc: announce new features in ChangeLog | Rainer Gerhards | 2012-09-19 | 1 | -0/+2 |
| | | | |||||
* | | | bugfix: MsgDup() did not copy CEE structure | Rainer Gerhards | 2012-09-19 | 2 | -1/+11 |
| | | | | | | | | | | | | | | | | | | This function was called at various places, most importantly during "last messages repeated n times" processing and omruleset. If CEE(JSON) data was present, it was lost as part of the copy process. | ||||
* | | | doc: begin rewrite of template doc | Rainer Gerhards | 2012-09-19 | 1 | -42/+157 |
| | | | |||||
* | | | subtree template parameter requires variable name, not CEE path | Rainer Gerhards | 2012-09-18 | 1 | -2/+13 |
| | | | | | | | | | | | | | | | This was changed to keep things in rsyslog.conf consistent. Can also come handy if at some time we want to have a global (disjunct) CEE path. | ||||
* | | | clarify: NO memleak, json_object_object_del() reduces reference count | Rainer Gerhards | 2012-09-18 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | json-c upstream made this clear some posts later in the discussion that I was refering to. | ||||
* | | | new ruleengine: do a deep copy for "set" statement affecting JSON tree | Rainer Gerhards | 2012-09-18 | 1 | -1/+50 |
| | | | | | | | | | | | | | | | Otherwise, further modifications will modify the original and "copied" JSON tree. | ||||
* | | | new ruleengine: implement native JSON in RainerScript | Rainer Gerhards | 2012-09-18 | 3 | -9/+51 |
| | | | |||||
* | | | cleanup | Rainer Gerhards | 2012-09-18 | 2 | -559/+0 |
| | | | |||||
* | | | new ruleengine: implement template type "subtree" | Rainer Gerhards | 2012-09-18 | 7 | -30/+126 |
| | | | |||||
* | | | new ruleengine: implement script concatenation (& operator) | Rainer Gerhards | 2012-09-17 | 3 | -1/+12 |
| | | | |||||
* | | | preparing for 7.1.3 releasev7.1.3 | Rainer Gerhards | 2012-09-17 | 3 | -3/+4 |
| | | | |||||
* | | | Merge branch 'master-newruleset' | Rainer Gerhards | 2012-09-17 | 8 | -17/+200 |
|\ \ \ | |||||
| * | | | new ruleengine: couple of fixes to new code | Rainer Gerhards | 2012-09-17 | 1 | -4/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | - memory leak if container was tried to replace - too early free due to invalid reference counting - performance improvement for set statement |