summaryrefslogtreecommitdiffstats
path: root/grammar
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v7-stable'Rainer Gerhards2013-11-052-3/+12
|\
| * Merge branch 'v7-stable-call-ruleset-queue' into v7-stableRainer Gerhards2013-11-052-3/+12
| |\ | | | | | | | | | | | | Conflicts: ChangeLog
| | * bugfix: call to ruleset with async queue did not use the queueRainer Gerhards2013-06-262-3/+12
| | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=443
* | | refactor regression fix: misadressing in property name debug outputRainer Gerhards2013-10-161-1/+3
| | |
* | | Merge branch 'master-var-refactor' into tmpRainer Gerhards2013-10-165-68/+70
|\ \ \
| * \ \ Merge branch 'master' into master-var-refactorRainer Gerhards2013-10-261-0/+4
| |\ \ \
| * \ \ \ Merge branch 'master' into master-var-refactorRainer Gerhards2013-10-261-0/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'v7-stable-varfree' into master-var-refactorRainer Gerhards2013-10-251-27/+45
| |\ \ \ \ \
| | * | | | | refactor var desctruction in script engineRainer Gerhards2013-10-251-25/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This provides better extensibility when new data types are added. Thanks to Pavel Levshin for suggesting this.
| * | | | | | refactor regression fix: misadressing during script variable evaluation in ↵Rainer Gerhards2013-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | debug mode Thanks to Pavel Levshin for reporting the problem.
| * | | | | | Merge branch 'master' into master-var-refactorRainer Gerhards2013-10-241-1/+1
| |\ \ \ \ \ \
| * | | | | | | fix VAR handling in script grammar and codeRainer Gerhards2013-10-232-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The $-var designator is now correctly stripped off the varname.
| * | | | | | | fix refactoring regression: make message and system properties work again in ↵Rainer Gerhards2013-10-231-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | script
| * | | | | | | improve debug outputRainer Gerhards2013-10-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we know also learn variable type
| * | | | | | | fix another small memleak introduced during refactoringRainer Gerhards2013-10-231-0/+1
| | | | | | | |
| * | | | | | | refactor: remove now no-longer needed functionsRainer Gerhards2013-10-232-10/+0
| | | | | | | |
| * | | | | | | refactor RainerScript variable accessRainer Gerhards2013-10-231-1/+11
| | | | | | | |
| * | | | | | | refactor: simplify JSON variable accessRainer Gerhards2013-10-232-3/+6
| | | | | | | |
| * | | | | | | refactor: use common code for message property description processingRainer Gerhards2013-10-222-22/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in all cases except script var access -- this comes next...
| * | | | | | | refactor: more simplification in property handlingRainer Gerhards2013-10-211-1/+1
| | | | | | | |
| * | | | | | | work a bit toward string handling unificationRainer Gerhards2013-10-212-15/+10
| | | | | | | |
* | | | | | | | Merge branch 'v7-stable'Rainer Gerhards2013-10-291-3/+6
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |
| * | | | | | bugfix: abort if "if $syslogfacility-text..." was being usedPavel Levshin2013-10-291-3/+6
| | | | | | |
* | | | | | | Make use of int64 json numbers, if availablePavel Levshin2013-10-261-0/+4
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'v7-stable'Rainer Gerhards2013-10-261-0/+1
|\| | | | |
| * | | | | bugfix: memory leak in strlen() RainerScript functionRainer Gerhards2013-10-251-0/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | Thanks to Gregoire Seux for reportig this bug. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=486
* | | | | Merge branch 'v7-stable'Rainer Gerhards2013-10-251-2/+3
|\| | | | | |_|/ / |/| | |
| * | | bugfix: buffer overrun if re_extract function was called for submatch 50Rainer Gerhards2013-10-251-1/+1
| | | | | | | | | | | | | | | | Thanks to Pavel Levshin for reporting the problem and its location.
| * | | bugfix: memleak in re_extract() functionRainer Gerhards2013-10-251-1/+2
| | | | | | | | | | | | | | | | Thanks to Pavel Levshin for reporting this problem.
* | | | 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.
* | | refactor config property filter decoding and fix some memleaksRainer Gerhards2013-10-181-15/+19
| | | | | | | | | | | | | | | all leaks are cosmetic, happen only once during startup and in error cases. Do not affect performance at all (but valgrind testing ;)).
* | | fix cosmetic memleak when property filter is disabledRainer Gerhards2013-10-181-0/+1
| | |
* | | Merge branch 'v7-stable'Rainer Gerhards2013-10-181-2/+4
|\| | | | | | | | | | | | | | Conflicts: runtime/conf.c
| * | bugfix: invalid property filter was not properly disabled in rulesetRainer Gerhards2013-10-181-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Note that this bugfix introduces a very slight memory leak, which is cosmetic, as it just holds data until termination that is no longer needed. It is just the part of the config that was invalid. We will "fix" this "issue" in the devel version first, as the fix is a bit too intrusive to do without hard need in the stable version.
* | | refactor property-based filter decodingRainer Gerhards2013-10-181-0/+106
| | | | | | | | | | | | among others, provides *much* better error messages to user
* | | remove unused variablesRainer Gerhards2013-10-181-2/+0
| | |
* | | Merge branch 'v7-stable'Rainer Gerhards2013-10-181-1/+4
|\| |
| * | bugfix: segfault if re_extract() function was used and no match foundRainer Gerhards2013-10-181-1/+4
| | |
* | | Merge branch 'master-lookup'Rainer Gerhards2013-10-133-1/+56
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: grammar/rainerscript.h runtime/rsyslog.h
| * | | add base plumbing for (later) dynamic table reloadRainer Gerhards2013-07-161-2/+1
| | | | | | | | | | | | | | | | | | | | among others, we change some internal interfaces. So far, we only add the necessary locks. More work in later commits.
| * | | milestone: basic lookup() functionality is presentRainer Gerhards2013-07-102-1/+52
| | | | | | | | | | | | | | | | done the naive way, string indzes only
| * | | Merge branch 'master' into master-lookupRainer Gerhards2013-07-091-49/+60
| |\ \ \
| * | | | milestone: add lookup_table stmt to RainerScriptRainer Gerhards2013-07-092-0/+6
| | | | | | | | | | | | | | | | | | | | ... but still does nothing execpt calling the handler.
* | | | | Merge branch 'v7-stable'Rainer Gerhards2013-10-101-3/+4
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | bugfix: array-based ==/!= comparisions lead to invalid resultsRainer Gerhards2013-10-101-3/+4
| | | | | | | | | | | | | | | | | | | | This was a regression introduced in 7.3.5 bei the PRI optimizer
* | | | | Merge branch 'v7-stable'Rainer Gerhards2013-08-261-1/+1
|\| | | |
| * | | | bugfix: imtcp addtlframedelimiter could not be set to zeroRainer Gerhards2013-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | Thanks to Chris Norton for alerting us.
| * | | | fix regression that caused freeInstance not to be correctly calledRainer Gerhards2013-07-152-2/+2
| | | | | | | | | | | | | | | | | | | | was introduced July, 5th 2013 by commit 8ee2b0b1610fbf4dff20453d188f379583410b42
* | | | | first shot at global variables (without proper sync so far)Rainer Gerhards2013-07-221-1/+1
| | | | |