summaryrefslogtreecommitdiffstats
path: root/grammar/lexer.l
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into master-var-refactorRainer Gerhards2013-10-241-1/+1
|\
| * re-enable global vars, but as an undocumented & unsupported featureRainer Gerhards2013-10-231-1/+1
| | | | | | | | This is done as we may be able to preserve the syntax.
| * remove global variable supportRainer Gerhards2013-10-221-2/+2
| | | | | | | | | | | | | | | | The original idea was not well thought out and global variables, as implemented, worked far different from what anybody would expect. As such, we consider the current approach as an experiment that did not work out and opt to removing it, clearing the way for a better future solution. Note: global vars were introduced in 7.5.3 on Sept, 11th 2013.
* | fix VAR handling in script grammar and codeRainer Gerhards2013-10-231-1/+1
|/ | | | The $-var designator is now correctly stripped off the varname.
* Merge branch 'master-lookup'Rainer Gerhards2013-10-131-0/+2
|\ | | | | | | | | | | Conflicts: grammar/rainerscript.h runtime/rsyslog.h
| * milestone: add lookup_table stmt to RainerScriptRainer Gerhards2013-07-091-0/+2
| | | | | | | | ... but still does nothing execpt calling the handler.
* | first shot at global variables (without proper sync so far)Rainer Gerhards2013-07-221-1/+1
| |
* | Merge branch 'master-localvars'Rainer Gerhards2013-07-201-1/+1
|\ \
| * | milestone: basic local variable functionality availableRainer Gerhards2013-07-171-1/+1
| | | | | | | | | | | | but some nits, like do not work with disk queues
* | | main_queue() config object addedRainer Gerhards2013-07-191-0/+2
|/ / | | | | | | doc still missing
* / fix build on FreeBSDCristiano Rolim2013-07-101-0/+2
|/
* bugfix: include files got included in the wrong orderRainer Gerhards2013-02-281-1/+7
| | | | | | | | | This happens if an $IncludeConfig directive was done on multiple files (e.g. the distro default of $IncludeConfig /etc/rsyslog.d/*.conf). In that case, the order of include file processing is reversed, which could lead to all sorts of problems. Thanks to Nathan Stratton Treadway for his great analysis of the problem, which made bug fixing really easy.
* bugfix: some property-based filter were incorrectly parsedRainer Gerhards2013-01-091-2/+5
| | | | | | | | | | | | | This usually lead to a syntax error on startup and rsyslogd not actually starting up. The problem was the regex, which did not care for double quote characters to follow in the action part - unfortunately something that can frequently happen with v6+ format. An example: :programname, isequal, "as" {action(type="omfile" ...) } Here, the part :programname, isequal, "as" {action(type="omfile" was treated as the property filter, and the rest as action part. Obviously, this did not work out. Unfortunately, such situations usually resulted in very hard to understand error messages.
* improve config reader error messages a bit moreRainer Gerhards2013-01-091-6/+12
|
* slightly improved config parser error messages when invalid escapes happenRainer Gerhards2013-01-091-1/+2
|
* cleanupRainer Gerhards2012-11-201-1/+0
|
* Merge branch 'v6-stable' into betaRainer Gerhards2012-10-041-0/+1
|\
| * bugfix: comments inside objects (e.g. action()) were not properly handledRainer Gerhards2012-10-041-0/+1
| |
* | implement "continue" RainerScript statementRainer Gerhards2012-10-011-0/+1
| |
* | implement RainerScript "call" statementRainer Gerhards2012-10-011-0/+8
| |
* | rainerscript: add basic plumbing for arraysRainer Gerhards2012-09-281-2/+11
| | | | | | | | | | can be used in expressions, but always evaluate to the first element, only
* | Implement RainerScript ruleset() statementRainer Gerhards2012-09-281-4/+5
| |
* | 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-211-1/+1
|\| | | | | | | | | Conflicts: grammar/lexer.l
| * bugfix: some valid legacy PRI filters were flagged as errornousRainer Gerhards2012-09-211-1/+1
| | | | | | | | | | | | 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.
* | new ruleengine: implement script concatenation (& operator)Rainer Gerhards2012-09-171-0/+1
| |
* | Merge branch 'master-newruleset'Rainer Gerhards2012-09-171-1/+5
|\ \
| * | Add set/unset stmt to grammar & ASTRainer Gerhards2012-09-131-1/+5
| | | | | | | | | | | | ... but not yet to executing engine
* | | Merge branch 'v6-devel'Rainer Gerhards2012-09-141-2/+2
|\ \ \ | |/ / |/| |
| * | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-141-2/+2
| |\| | | | | | | | | | | | | Conflicts: runtime/rule.c
| | * Fix length calculation for script string constantsRainer Gerhards2012-09-141-2/+2
| | | | | | | | | | | | | | | | | | This could lead to various problems, like if-filters not working. Note this is a regression from yesterdays escape fix, so there exist no released version with this problem.
* | | Merge branch 'v6-devel'Rainer Gerhards2012-09-131-2/+8
|\| | | | | | | | | | | | | | Conflicts: ChangeLog
| * | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-131-2/+8
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog grammar/rainerscript.c grammar/rainerscript.h runtime/rule.c
| | * bugfix: missing support for escape sequences in RainerScriptRainer Gerhards2012-09-131-2/+8
| | | | | | | | | | | | | | | | | | | | | Only \' was supported. Now the usual set is supported. Note that v5 used \x as escape where x was any character (e.g. "\n" meant "n" and NOT LF). This also means there is some incompatibility to v5 for well-know sequences. Better break it now than later.
* | | Merge branch 'v6-devel'Rainer Gerhards2012-09-121-1/+1
|\| | | | | | | | | | | | | | | | | Conflicts: grammar/grammar.y grammar/lexer.l
| * | forward-compatibility patch for $ruleset processingRainer Gerhards2012-09-121-0/+3
| | | | | | | | | | | | | | | v7 needs a different handling, it's easer in the long term if we introduce this in v6 as well. Non-intrusive change.
* | | new ruleengine: properly handle $ruleset directiveRainer Gerhards2012-09-121-2/+5
| | |
* | | new ruleengine: fix memory leaks & a little cleanupRainer Gerhards2012-09-101-4/+1
| | |
* | | new ruleengine: properly freeing stmt treeRainer Gerhards2012-09-061-3/+1
| | |
* | | new ruleengine: implement rainerscript execution engineRainer Gerhards2012-09-061-1/+1
| | |
* | | new ruleengine: script block correctly builtRainer Gerhards2012-09-041-1/+1
| | |
* | | new ruleengine: first code for stmt handlingRainer Gerhards2012-09-041-0/+1
| | |
* | | new ruleengine: first shot at grammarRainer Gerhards2012-09-031-3/+5
|/ /
* / add base plumbing for template() config object to grammarRainer Gerhards2012-08-241-1/+7
|/
* conf file: bufgix: legacy parsing of some filters did not work correctlyRainer Gerhards2012-02-011-1/+1
|
* bugfix: facility local<x> was not correctly interpreted in legacy filtersRainer Gerhards2011-09-281-1/+1
| | | | | Was only accepted if it was the first PRI in a multi-filter PRI. Thanks to forum user Mark for bringing this to our attention.
* bugfix: config parser did not support properties with dashes in themRainer Gerhards2011-09-151-1/+1
| | | | ...inside property-based filters. Thanks to Gerrit Seré for reporting this.
* milestone: queue object now has a param handler for new conf interfaceRainer Gerhards2011-07-221-3/+18
| | | | ... and action queue defs use this new interface (but not yet the main queues)
* need to handle legacy-legacy omusrmsg format stricterRainer Gerhards2011-07-221-1/+1
| | | | otherwise, the grammar for if-constructs was broken