summaryrefslogtreecommitdiffstats
path: root/template.c
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* 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
| | |
* | | milestone: first PoC for hierarchical data inside msgRainer Gerhards2012-08-271-1/+1
| |/ |/|
* | Merge branch 'v6-stable'Rainer Gerhards2012-08-251-15/+24
|\ \ | |/ |/| | | | | | | | | | | Conflicts: ChangeLog configure.ac runtime/ruleset.c tools/syslogd.c
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-08-251-15/+24
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/manual.html runtime/ruleset.c template.h threads.c tools/syslogd.c
| | * Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stableRainer Gerhards2012-08-251-15/+24
| | |\ | | | | | | | | | | | | | | | | Conflicts: template.c
| | | * change template.[ch] to ASL 2.0, removing a GPLv3-only patchRainer Gerhards2012-08-251-15/+24
| | | | | | | | | | | | | | | | | | | | see template.c file header for details Note that this functionality was almost never used in practice
| | * | Merge branch 'v5-stable-field-substring' into v5-betaRainer Gerhards2012-04-271-8/+29
| | |\ \
| | | * | added capability to specify substrings for field extraction modeRainer Gerhards2012-04-271-8/+29
| | | |/
* | | / Fix printing of some template optionsMiloslav Trmač2012-08-211-1/+4
|/ / / | | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | Merge branch 'master-fieldext'Rainer Gerhards2012-04-261-8/+29
|\ \ \
| * | | added capability to specify substrings for field extraction modeRainer Gerhards2012-04-261-8/+29
| | | |
* | | | cleanup: removed unused but set parametersRainer Gerhards2012-04-231-2/+1
|/ / /
* | | added the "jsonf" property replacer option (and fieldname) & bugfixRainer Gerhards2012-04-191-18/+55
| | | | | | | | | | | | | | | bugfix: property replacer option "json" could lead to content loss message was truncated if escaping was necessary
* | | added "date-unixtimestamp" property replacer option to format as a unix ↵Rainer Gerhards2012-03-291-0/+5
| | | | | | | | | | | | timestamp
* | | added "json" property replacer optionRainer Gerhards2012-03-161-1/+16
| | |
* | | cleanup: different text escape types made more portableRainer Gerhards2012-01-191-10/+0
| | |
* | | Merge branch 'v5-devel' into masterRainer Gerhards2012-01-181-32/+60
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog Makefile.am configure.ac doc/manual.html plugins/imptcp/imptcp.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/parser.c template.c tools/omfwd.c tools/syslogd.c
| * | add JSON escaping optionNathan Scott2012-01-171-33/+57
| |/ | | | | | | | | | | | | | | | | | | | | | | Following the path taken by the two SQL formatting options, which escape single quotes with double quotes (amongst other things), this patch adds a JSON quoting option. JSON is the opposite to the SQL options, requiring double quotes to be quoted within a string. This patch provides a formatting option implementing this requirement, while piggy-backing on the existing code as much as possible. Signed-off-by: Nathan Scott <nathans@aconex.com>
* | milestone: conf obj interface now utilzes rsconf_tRainer Gerhards2011-04-191-7/+0
| |
* | milestone: templates are now in config objectRainer Gerhards2011-04-191-23/+27
| |
* | Merge branch 'v5-devel'Rainer Gerhards2011-03-311-9/+32
|\| | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html doc/rsyslog_conf.html runtime/msg.c runtime/rsyslog.h template.c