Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v7-stable-newmsglock' into master-newmsglock | Rainer Gerhards | 2012-12-06 | 1 | -1/+7 |
|\ | | | | | | | | | | | | | Conflicts: runtime/msg.c runtime/queue.c tools/syslogd.c | ||||
| * | fix display problem with some date-format template options | Rainer Gerhards | 2012-11-29 | 1 | -1/+7 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-29 | 1 | -4/+5 |
|\| | |||||
| * | bugfix: template "type" parameter is mandatory (but was not) | Rainer Gerhards | 2012-11-29 | 1 | -4/+5 |
| | | |||||
* | | refactor error processing in string template handling | Rainer Gerhards | 2012-11-29 | 1 | -43/+29 |
| | | |||||
* | | bugfix: no error message for invalid string template parameters | Rainer Gerhards | 2012-11-29 | 1 | -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 Gerhards | 2012-11-14 | 1 | -1/+1 |
|\| | |||||
| * | bugfix: garbled message if field name was used with jsonf property option | Rainer Gerhards | 2012-11-14 | 1 | -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 Gerhards | 2012-11-08 | 1 | -6/+12 |
|\| | |||||
| * | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-11-08 | 1 | -1/+2 |
| |\ | |||||
| | * | bugfix: no error msg on invalid field option in legacy/string template | Rainer Gerhards | 2012-11-08 | 1 | -1/+2 |
| | | | |||||
| * | | bugfixes in string-type template()S | Rainer Gerhards | 2012-11-08 | 1 | -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 Gerhards | 2012-10-11 | 1 | -4/+0 |
| | | | |||||
| * | | fix small memory leak with string-type templates | Rainer Gerhards | 2012-10-11 | 1 | -0/+1 |
| | | | |||||
* | | | optimize property replacer: reduce runtime for simple processing | Rainer Gerhards | 2012-10-11 | 1 | -2/+20 |
| | | | |||||
* | | | Merge branch 'master' into master-newtemplate | Rainer Gerhards | 2012-10-11 | 1 | -4/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: template.c | ||||
| * \ \ | Merge branch 'v6-devel' | Rainer Gerhards | 2012-10-11 | 1 | -4/+1 |
| |\ \ \ | | |/ / | |/| / | | |/ | | | | Conflicts: template.c | ||||
| | * | 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 |
| | | | |||||
* | | | do "template date call" only when actually needed | Rainer Gerhards | 2012-10-11 | 1 | -0/+32 |
| | | | |||||
* | | | optimize: do "template time() call" only once per batch | Rainer Gerhards | 2012-10-10 | 1 | -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 template | Rainer Gerhards | 2012-10-10 | 1 | -4/+15 |
|/ / | | | | | | | Things like $YEAR, $MONTH required a time() call each. | ||||
* | | 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 |
| | | |