summaryrefslogtreecommitdiffstats
path: root/template.c
Commit message (Collapse)AuthorAgeFilesLines
* bugfix: regression in template processingPavel Levshin2013-11-081-1/+1
|
* fix small memleak introduced during refactoringRainer Gerhards2013-10-231-2/+3
|
* refactor: align jsonFind() calling interface with recent changesRainer Gerhards2013-10-231-1/+1
|
* refactor get.*PropVal() series of functionsRainer Gerhards2013-10-231-14/+20
|
* refactor: simplify JSON variable accessRainer Gerhards2013-10-231-26/+4
|
* refactor: use common code for message property description processingRainer Gerhards2013-10-221-50/+27
| | | | in all cases except script var access -- this comes next...
* refactor: more simplification in property handlingRainer Gerhards2013-10-211-12/+8
|
* refactor: somewhat simplify property-name-to-id mappingRainer Gerhards2013-10-211-2/+2
|
* work a bit toward string handling unificationRainer Gerhards2013-10-211-46/+34
|
* Merge branch 'v7-stable'Rainer Gerhards2013-09-031-1/+1
|\
| * make rsyslog use the new json-c pkgconfig file if availablehwoarang2013-09-031-1/+1
| |
* | first shot at global variables (without proper sync so far)Rainer Gerhards2013-07-221-5/+21
| |
* | milestone: basic local variable functionality availableRainer Gerhards2013-07-171-4/+30
| | | | | | | | but some nits, like do not work with disk queues
* | refactor in preparation of local variablesRainer Gerhards2013-07-171-1/+1
|/ | | | | local variables require a second json root; this refactoring makes sure we can basically use common functions for json handling
* bugfix: $template statement with multiple spaces lead to invalid tpl nameRainer Gerhards2013-05-271-0/+1
| | | | | | | | | | | | | If multiple spaces were used in front of the template name, all but one of them became actually part of the template name. So $template a,"..." would be name " a", and as such "a" was not available, e.g. in *.* /var/log/file;a This is a legacy config problem. As it was unreported for many years, no backport of the fix to old versions will happen. This is a long-standing bug that was only recently reported by forum user mc-sim. Reference: http://kb.monitorware.com/post23448.html
* Merge branch 'v7-stable-info'Rainer Gerhards2013-03-291-10/+34
|\ | | | | | | | | | | Conflicts: ChangeLog template.c
| * permit substring extraction relative to end-of-string in templatesRainer Gerhards2013-03-291-10/+34
| |
* | optimize: do date() call in template processing only if actually neededRainer Gerhards2013-01-131-32/+0
| |
* | Merge branch 'v7-stable-newmsglock' into master-newmsglockRainer Gerhards2012-12-061-1/+7
|\| | | | | | | | | | | | | Conflicts: runtime/msg.c runtime/queue.c tools/syslogd.c
| * fix display problem with some date-format template optionsRainer Gerhards2012-11-291-1/+7
| |
* | Merge branch 'v7-stable'Rainer Gerhards2012-11-291-4/+5
|\|
| * bugfix: template "type" parameter is mandatory (but was not)Rainer Gerhards2012-11-291-4/+5
| |
* | refactor error processing in string template handlingRainer Gerhards2012-11-291-43/+29
| |
* | bugfix: no error message for invalid string template parametersRainer Gerhards2012-11-291-4/+10
| | | | | | | | | | | | | | | | | | rather a malformed template was generated, and error information emitted at runtime. However, this could be quite confusing. Note that with this "bugfix" user experience changes: formerly, rsyslog and the affected actions properly started up, but the actions did not produce proper data. Now, there are startup error messages and the actions are NOT executed (due to missing template due to template error).
* | Merge branch 'v7-stable'Rainer Gerhards2012-11-141-1/+1
|\|
| * bugfix: garbled message if field name was used with jsonf property optionRainer Gerhards2012-11-141-1/+1
| | | | | | | | | | | | | | The length for the field name was invalidly computed, resulting in either truncated field names or including extra random data. If the random data contained NULs, the rest of the message became unreadable. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=374
* | Merge branch 'v7-stable'Rainer Gerhards2012-11-081-6/+12
|\|
| * Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-081-1/+2
| |\
| | * bugfix: no error msg on invalid field option in legacy/string templateRainer Gerhards2012-11-081-1/+2
| | |
| * | bugfixes in string-type template()SRainer Gerhards2012-11-081-5/+10
| | | | | | | | | | | | | | | | | | | | | Both are closely related and thus rolled into a single commit. - bugfix: improper handling of backslash in string-type template()s - bugfix: leading quote (") in string-type template() lead to thight loop on startup
| * | remove some assert()'s - valgrind does a better job...Rainer Gerhards2012-10-111-4/+0
| | |
| * | fix small memory leak with string-type templatesRainer Gerhards2012-10-111-0/+1
| | |
* | | optimize property replacer: reduce runtime for simple processingRainer Gerhards2012-10-111-2/+20
| | |
* | | Merge branch 'master' into master-newtemplateRainer Gerhards2012-10-111-4/+1
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: template.c
| * \ \ Merge branch 'v6-devel'Rainer Gerhards2012-10-111-4/+1
| |\ \ \ | | |/ / | |/| / | | |/ | | | Conflicts: template.c
| | * remove some assert()'s - valgrind does a better job...Rainer Gerhards2012-10-111-4/+0
| | |
| | * fix small memory leak with string-type templatesRainer Gerhards2012-10-111-0/+1
| | |
* | | do "template date call" only when actually neededRainer Gerhards2012-10-111-0/+32
| | |
* | | optimize: do "template time() call" only once per batchRainer Gerhards2012-10-101-15/+9
| | | | | | | | | | | | | | | | | | This still needs more optimizing as the call is very often NOT needed - but we need to know about the templates in that case.
* | | refactor tpl processor so that date is queried once per templateRainer Gerhards2012-10-101-4/+15
|/ / | | | | | | Things like $YEAR, $MONTH required a time() call each.
* | bugfix: subtree-type template incorrectly handledRainer Gerhards2012-09-211-4/+9
| |
* | 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.
* | new ruleengine: implement template type "subtree"Rainer Gerhards2012-09-181-12/+76
| |
* | Merge branch 'v6-devel'Rainer Gerhards2012-09-171-8/+8
|\| | | | | | | | | Conflicts: template.c
| * Fix other small memory leaks in template() processingRainer Gerhards2012-09-171-4/+7
| |
| * bugfix: small memory leaks in template() statementsRainer Gerhards2012-09-171-3/+9
| | | | | | | | | | these were one-time memory leaks during startup, so they did NOT grow during runtime
* | Fix reference countingMiloslav Trmač2012-09-041-1/+1
| | | | | | | | | | | | | | When adding a JSON object to the template output, make sure to increment its reference count. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | Don't leak configuration value arraysMiloslav Trmač2012-09-041-0/+4
| | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | Don't leak property nameMiloslav Trmač2012-09-041-1/+3
| | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | Fix a memory leak in "outname"Miloslav Trmač2012-09-041-1/+1
| | | | | | | | | | | | In all cases, the variable already contains a newly allocated copy. Signed-off-by: Miloslav Trmač <mitr@redhat.com>