Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | bugfix: regression in template processing | Pavel Levshin | 2013-11-08 | 1 | -1/+1 |
| | |||||
* | fix small memleak introduced during refactoring | Rainer Gerhards | 2013-10-23 | 1 | -2/+3 |
| | |||||
* | refactor: align jsonFind() calling interface with recent changes | Rainer Gerhards | 2013-10-23 | 1 | -1/+1 |
| | |||||
* | refactor get.*PropVal() series of functions | Rainer Gerhards | 2013-10-23 | 1 | -14/+20 |
| | |||||
* | refactor: simplify JSON variable access | Rainer Gerhards | 2013-10-23 | 1 | -26/+4 |
| | |||||
* | refactor: use common code for message property description processing | Rainer Gerhards | 2013-10-22 | 1 | -50/+27 |
| | | | | in all cases except script var access -- this comes next... | ||||
* | refactor: more simplification in property handling | Rainer Gerhards | 2013-10-21 | 1 | -12/+8 |
| | |||||
* | refactor: somewhat simplify property-name-to-id mapping | Rainer Gerhards | 2013-10-21 | 1 | -2/+2 |
| | |||||
* | work a bit toward string handling unification | Rainer Gerhards | 2013-10-21 | 1 | -46/+34 |
| | |||||
* | Merge branch 'v7-stable' | Rainer Gerhards | 2013-09-03 | 1 | -1/+1 |
|\ | |||||
| * | make rsyslog use the new json-c pkgconfig file if available | hwoarang | 2013-09-03 | 1 | -1/+1 |
| | | |||||
* | | first shot at global variables (without proper sync so far) | Rainer Gerhards | 2013-07-22 | 1 | -5/+21 |
| | | |||||
* | | milestone: basic local variable functionality available | Rainer Gerhards | 2013-07-17 | 1 | -4/+30 |
| | | | | | | | | but some nits, like do not work with disk queues | ||||
* | | refactor in preparation of local variables | Rainer Gerhards | 2013-07-17 | 1 | -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 name | Rainer Gerhards | 2013-05-27 | 1 | -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 Gerhards | 2013-03-29 | 1 | -10/+34 |
|\ | | | | | | | | | | | Conflicts: ChangeLog template.c | ||||
| * | permit substring extraction relative to end-of-string in templates | Rainer Gerhards | 2013-03-29 | 1 | -10/+34 |
| | | |||||
* | | optimize: do date() call in template processing only if actually needed | Rainer Gerhards | 2013-01-13 | 1 | -32/+0 |
| | | |||||
* | | 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> |