summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Improve script execution speed for important string-comparisonsRainer Gerhards2012-09-211-2/+7
|
* Merge branch 'v6-stable' into master-newrulesetRainer Gerhards2012-09-211-1/+1
|\ | | | | | | | | Conflicts: grammar/lexer.l
| * Implemented different grammar for pri filtersRainer Gerhards2012-09-211-1/+1
| | | | | | | | | | | | | | | | The method introduced by the previous commit caused issues in v7 as it was too generic. Most importantly, it permitted simple words (like "stop") to (invalidly) be detected as pri filters. Now, the grammar is close to the initial one, and each pri filter must at least have a comma or a period inside it, which does not conflict with simple words.
* | Merge branch 'v6-stable' into master-newrulesetRainer Gerhards2012-09-212-1/+5
|\| | | | | | | | | Conflicts: grammar/lexer.l
| * bugfix: some valid legacy PRI filters were flagged as errornousRainer Gerhards2012-09-212-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 commitRainer Gerhards2012-09-211-1/+0
| |
* | Implement script optimization IF -> PRIFILTRainer Gerhards2012-09-216-29/+115
| |
* | bugfix: subtree-type template incorrectly handledRainer Gerhards2012-09-211-4/+9
| |
* | Implement script optimizer basic constant folding & NOP removalRainer Gerhards2012-09-211-31/+164
| |
* | Add skeleton for RainerScript optimizerRainer Gerhards2012-09-205-0/+123
| | | | | | | | 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
| | |
| | * Added missing iRet handler code into CheckConnection() in netstrm.cAndre Lorbach2012-09-201-1/+4
| | |
* | | Implement RainerScript prifield() functionRainer Gerhards2012-09-207-3/+101
| | |
* | | Add new tests to testbenchRainer Gerhards2012-09-205-0/+63
| | |
* | | Implement RainerScript field() functionRainer Gerhards2012-09-208-8/+143
| | |
* | | Merge branch 'v6-devel'Rainer Gerhards2012-09-202-0/+8
|\| |
| * | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-202-0/+8
| |\| | | | | | | | | | | | | Conflicts: ChangeLog
| | * doc: add last bugfix to ChangeLogRainer Gerhards2012-09-201-0/+5
| | |
| | * Fix missing Sysklogd templateMilan Bartos2012-09-201-0/+3
| | | | | | | | | | | | modified: runtime/rsconf.c
* | | Merge branch 'v6-devel'Rainer Gerhards2012-09-205-2/+16
|\| |
| * | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-202-1/+2
| |\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * preparing for 6.4.2 releasev6.4.2Rainer Gerhards2012-09-204-3/+3
| | |
| | * testbench: do not run tests requiring root privs if non-rootRainer Gerhards2012-09-202-0/+8
| | |
| | * bugfix: config validation run did not always return correct return stateRainer Gerhards2012-09-202-0/+2
| | |
| * | bugfix: config validation run did not always return correct return stateRainer Gerhards2012-09-202-0/+2
| | |
| * | testbench: do not run tests requiring root privs if non-rootRainer Gerhards2012-09-202-0/+8
| | |
| * | bugfix: small memory leak in imdiagRainer Gerhards2012-09-201-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 listRainer Gerhards2012-09-201-1/+4
| | |
* | | bugfix: invalid debug message for normal operationRainer Gerhards2012-09-191-1/+1
| | | | | | | | | | | | had no effect except on debug log
* | | bugfix: small memory leak in imdiagRainer Gerhards2012-09-194-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 Gerhards2012-09-193-2/+19
|\| |
| * | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-193-2/+19
| |\|
| | * bugfix: potential abort, if action queue could not be properly startedRainer Gerhards2012-09-193-2/+19
| | | | | | | | | | | | This most importantly could happen due to configuration errors.
* | | preparing for 7.1.4 releasev7.1.4Rainer Gerhards2012-09-195-11/+13
| | |
* | | bugfix: debug output indicated improper queue typeRainer Gerhards2012-09-192-0/+5
| | |
* | | Add CEE test to testbenchRainer Gerhards2012-09-193-0/+22
| | |
* | | bugfix: omfile action did not respect "template" parameterRainer Gerhards2012-09-192-1/+5
| | | | | | | | | | | | ... and used default template in all cases
* | | Implement ability for CEE-based properties to be stored in disk queuesRainer Gerhards2012-09-193-2/+23
| | |
* | | doc: announce new features in ChangeLogRainer Gerhards2012-09-191-0/+2
| | |
* | | bugfix: MsgDup() did not copy CEE structureRainer Gerhards2012-09-192-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 docRainer Gerhards2012-09-191-42/+157
| | |
* | | subtree template parameter requires variable name, not CEE pathRainer Gerhards2012-09-181-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 countRainer Gerhards2012-09-181-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 treeRainer Gerhards2012-09-181-1/+50
| | | | | | | | | | | | | | | Otherwise, further modifications will modify the original and "copied" JSON tree.
* | | new ruleengine: implement native JSON in RainerScriptRainer Gerhards2012-09-183-9/+51
| | |
* | | cleanupRainer Gerhards2012-09-182-559/+0
| | |
* | | new ruleengine: implement template type "subtree"Rainer Gerhards2012-09-187-30/+126
| | |
* | | new ruleengine: implement script concatenation (& operator)Rainer Gerhards2012-09-173-1/+12
| | |