Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remove some assert()'s - valgrind does a better job... | Rainer Gerhards | 2012-10-11 | 1 | -4/+0 |
| | |||||
* | fix small memory leak with string-type templates | Rainer Gerhards | 2012-10-11 | 1 | -0/+1 |
| | |||||
* | bugfix: subtree-type template incorrectly handled | Rainer Gerhards | 2012-09-21 | 1 | -4/+9 |
| | |||||
* | subtree template parameter requires variable name, not CEE path | Rainer Gerhards | 2012-09-18 | 1 | -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 Gerhards | 2012-09-18 | 1 | -12/+76 |
| | |||||
* | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-17 | 1 | -8/+8 |
|\ | | | | | | | | | Conflicts: template.c | ||||
| * | Fix other small memory leaks in template() processing | Rainer Gerhards | 2012-09-17 | 1 | -4/+7 |
| | | |||||
| * | bugfix: small memory leaks in template() statements | Rainer Gerhards | 2012-09-17 | 1 | -3/+9 |
| | | | | | | | | | | these were one-time memory leaks during startup, so they did NOT grow during runtime | ||||
* | | Fix reference counting | Miloslav Trmač | 2012-09-04 | 1 | -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 arrays | Miloslav Trmač | 2012-09-04 | 1 | -0/+4 |
| | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com> | ||||
* | | Don't leak property name | Miloslav Trmač | 2012-09-04 | 1 | -1/+3 |
| | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com> | ||||
* | | Fix a memory leak in "outname" | Miloslav Trmač | 2012-09-04 | 1 | -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" property | Miloslav Trmač | 2012-09-04 | 1 | -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 null | Miloslav Trmač | 2012-09-04 | 1 | -6/+1 |
| | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com> | ||||
* | | add native json-passing to output modules using JSON API | Rainer Gerhards | 2012-08-31 | 1 | -10/+31 |
| | | |||||
* | | Merge branch 'master' into v7-devel | Rainer Gerhards | 2012-08-31 | 1 | -28/+47 |
|\| | |||||
| * | switch field default to "mandatory" and implement that mode | Rainer Gerhards | 2012-08-30 | 1 | -11/+14 |
| | | |||||
| * | add capability to specify "optional" attribute for list-type templates, too | Rainer Gerhards | 2012-08-29 | 1 | -0/+5 |
| | | |||||
| * | Add support for optional fields | Miloslav Trmač | 2012-08-29 | 1 | -0/+5 |
| | | |||||
| * | default outname for $!<property> is now without $! prefix | Rainer Gerhards | 2012-08-29 | 1 | -27/+33 |
| | | | | | | | | also some type cleanup and simplification | ||||
* | | Merge branch 'master' into v7-devel | Rainer Gerhards | 2012-08-29 | 1 | -0/+45 |
|\| | |||||
| * | implement ACT_JSON_PASSING | Rainer Gerhards | 2012-08-29 | 1 | -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-devel | Rainer Gerhards | 2012-08-27 | 1 | -4/+572 |
|\| | | | | | | | | | Conflicts: runtime/msg.c | ||||
| * | add capability to configure outname for constant (inside template) | Rainer Gerhards | 2012-08-25 | 1 | -13/+8 |
| | | | | | | | | also some cleanup | ||||
| * | milestone: LIST-type templates support full option set | Rainer Gerhards | 2012-08-25 | 1 | -0/+72 |
| | | |||||
| * | milestone: LIST-type template now only missing regex support | Rainer Gerhards | 2012-08-25 | 1 | -0/+41 |
| | | |||||
| * | milestone: LIST-type templates work, but no all options yet present | Rainer Gerhards | 2012-08-25 | 1 | -2/+264 |
| | | |||||
| * | milestone: base plumbing for LIST-type templates mostly in place | Rainer Gerhards | 2012-08-25 | 1 | -11/+33 |
| | | |||||
| * | Merge branch 'master' into master-newtemplate | Rainer Gerhards | 2012-08-25 | 1 | -14/+23 |
| |\ | |||||
| * | | v6 config/templates: legacy types are now supported via template() | Rainer Gerhards | 2012-08-25 | 1 | -1/+177 |
| | | | |||||
* | | | milestone: first PoC for hierarchical data inside msg | Rainer Gerhards | 2012-08-27 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-08-25 | 1 | -15/+24 |
|\ \ | |/ |/| | | | | | | | | | | | Conflicts: ChangeLog configure.ac runtime/ruleset.c tools/syslogd.c | ||||
| * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-08-25 | 1 | -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-stable | Rainer Gerhards | 2012-08-25 | 1 | -15/+24 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: template.c | ||||
| | | * | change template.[ch] to ASL 2.0, removing a GPLv3-only patch | Rainer Gerhards | 2012-08-25 | 1 | -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-beta | Rainer Gerhards | 2012-04-27 | 1 | -8/+29 |
| | |\ \ | |||||
| | | * | | added capability to specify substrings for field extraction mode | Rainer Gerhards | 2012-04-27 | 1 | -8/+29 |
| | | |/ | |||||
* | | / | Fix printing of some template options | Miloslav Trmač | 2012-08-21 | 1 | -1/+4 |
|/ / / | | | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com> | ||||
* | | | Merge branch 'master-fieldext' | Rainer Gerhards | 2012-04-26 | 1 | -8/+29 |
|\ \ \ | |||||
| * | | | added capability to specify substrings for field extraction mode | Rainer Gerhards | 2012-04-26 | 1 | -8/+29 |
| | | | | |||||
* | | | | cleanup: removed unused but set parameters | Rainer Gerhards | 2012-04-23 | 1 | -2/+1 |
|/ / / | |||||
* | | | added the "jsonf" property replacer option (and fieldname) & bugfix | Rainer Gerhards | 2012-04-19 | 1 | -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 Gerhards | 2012-03-29 | 1 | -0/+5 |
| | | | | | | | | | | | | timestamp | ||||
* | | | added "json" property replacer option | Rainer Gerhards | 2012-03-16 | 1 | -1/+16 |
| | | | |||||
* | | | cleanup: different text escape types made more portable | Rainer Gerhards | 2012-01-19 | 1 | -10/+0 |
| | | | |||||
* | | | Merge branch 'v5-devel' into master | Rainer Gerhards | 2012-01-18 | 1 | -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 option | Nathan Scott | 2012-01-17 | 1 | -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_t | Rainer Gerhards | 2011-04-19 | 1 | -7/+0 |
| | | |||||
* | | milestone: templates are now in config object | Rainer Gerhards | 2011-04-19 | 1 | -23/+27 |
| | | |||||
* | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-03-31 | 1 | -9/+32 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html doc/rsyslog_conf.html runtime/msg.c runtime/rsyslog.h template.c |