summaryrefslogtreecommitdiffstats
path: root/template.c
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | Free a temporary object for the "name" propertyMiloslav Trmač2012-09-041-2/+5
| | | | | | | | | | | | | | | | | | Fixes a memory leak. Another option is to use cstrConstructFromESStr, but that would change semantics of NUL handling. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | Set value of a mandatory JSON field to nullMiloslav Trmač2012-09-041-6/+1
| | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | add native json-passing to output modules using JSON APIRainer Gerhards2012-08-311-10/+31
| |
* | Merge branch 'master' into v7-develRainer Gerhards2012-08-311-28/+47
|\|
| * switch field default to "mandatory" and implement that modeRainer Gerhards2012-08-301-11/+14
| |
| * add capability to specify "optional" attribute for list-type templates, tooRainer Gerhards2012-08-291-0/+5
| |
| * Add support for optional fieldsMiloslav Trmač2012-08-291-0/+5
| |
| * default outname for $!<property> is now without $! prefixRainer Gerhards2012-08-291-27/+33
| | | | | | | | also some type cleanup and simplification
* | Merge branch 'master' into v7-develRainer Gerhards2012-08-291-0/+45
|\|
| * implement ACT_JSON_PASSINGRainer Gerhards2012-08-291-0/+45
| | | | | | | | | | NOTE: this is only compile-tested! For real testing, a module using that mode is required. Will be done as next steps.
* | Merge branch 'master' into v7-develRainer Gerhards2012-08-271-4/+572
|\| | | | | | | | | Conflicts: runtime/msg.c
| * add capability to configure outname for constant (inside template)Rainer Gerhards2012-08-251-13/+8
| | | | | | | | also some cleanup
| * milestone: LIST-type templates support full option setRainer Gerhards2012-08-251-0/+72
| |
| * milestone: LIST-type template now only missing regex supportRainer Gerhards2012-08-251-0/+41
| |
| * milestone: LIST-type templates work, but no all options yet presentRainer Gerhards2012-08-251-2/+264
| |
| * milestone: base plumbing for LIST-type templates mostly in placeRainer Gerhards2012-08-251-11/+33
| |
| * Merge branch 'master' into master-newtemplateRainer Gerhards2012-08-251-14/+23
| |\
| * | v6 config/templates: legacy types are now supported via template()Rainer Gerhards2012-08-251-1/+177
| | |