Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add capability to configure outname for constant (inside template) | Rainer Gerhards | 2012-08-25 | 1 | -2/+2 |
| | | | | also some cleanup | ||||
* | milestone: LIST-type templates work, but no all options yet present | Rainer Gerhards | 2012-08-25 | 1 | -5/+6 |
| | |||||
* | milestone: base plumbing for LIST-type templates mostly in place | Rainer Gerhards | 2012-08-25 | 1 | -0/+1 |
| | |||||
* | Merge branch 'master' into master-newtemplate | Rainer Gerhards | 2012-08-25 | 10 | -34/+71 |
|\ | |||||
| * | Merge branch 'v6-stable' | Rainer Gerhards | 2012-08-25 | 10 | -34/+71 |
| |\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac runtime/ruleset.c tools/syslogd.c | ||||
| | * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-08-25 | 9 | -34/+34 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -0/+2 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: template.c | ||||
| | | | * | change template.[ch] to ASL 2.0, removing a GPLv3-only patch | Rainer Gerhards | 2012-08-25 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | see template.c file header for details Note that this functionality was almost never used in practice | ||||
| | | | * | nit: forward-compatible default ruleset name as used in next version | Rainer Gerhards | 2012-08-22 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | small bugfix: stream timeout API use was incorrect | Rainer Gerhards | 2012-08-22 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | Thanks to Andre Lorbach for mentioning this. | ||||
| | | * | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-08-22 | 4 | -14/+50 |
| | | |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/ruleset.c | ||||
| | | | * | bugfix: multiple main queues with same queue file name were not detected | Rainer Gerhards | 2012-08-22 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lead to queue file corruption. While the root cause is a config error, it is a bug that this important and hard to find config error was not detected by rsyslog. | ||||
| | | * | | changed TRUE/FALSE to RSTRUE/RSFALSE | Rainer Gerhards | 2012-08-22 | 7 | -27/+26 |
| | | | | | | | | | | | | | | | | | | | | This is done to prevent name claches with libraries. | ||||
| | | * | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-06-11 | 1 | -4/+8 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | \ \ | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2012-08-20 | 1 | -0/+37 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | nitfix: remove quirck in new debug message code | Rainer Gerhards | 2012-08-01 | 1 | -4/+2 |
| | | | | | | |||||
| | | * | | | more elaborate debug logging for object deserializer | Rainer Gerhards | 2012-08-01 | 1 | -0/+39 |
| | | | | | | |||||
| | | * | | | undo last queue patch - caused a regression | Rainer Gerhards | 2012-08-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | some more elaborate patch is needed and will be provided | ||||
| | | * | | | bugfix: DA queue fixed handling of bad queue files. | Andre Lorbach | 2012-07-31 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | v6 config/templates: legacy types are now supported via template() | Rainer Gerhards | 2012-08-25 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | add base plumbing for template() config object to grammar | Rainer Gerhards | 2012-08-24 | 1 | -0/+10 |
|/ / / / / | |||||
* | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-07-24 | 3 | -2/+50 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | ||||
| * | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2012-07-24 | 2 | -9/+9 |
| |\| | | | |||||
| * | | | | omelasticsearch: better debug instrumentation | Rainer Gerhards | 2012-07-09 | 1 | -2/+0 |
| | | | | | |||||
| * | | | | debug log: cleaned up & streamlined queue param output | Rainer Gerhards | 2012-07-05 | 1 | -20/+43 |
| | | | | | |||||
| * | | | | debug log: emit (some) action queue parameters to debug log | Rainer Gerhards | 2012-07-05 | 2 | -0/+27 |
| | | | | | |||||
* | | | | | Merge branch 'v5-stable' | Rainer Gerhards | 2012-07-24 | 2 | -9/+9 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | bugfix: strm class could abort under some circumstances | Rainer Gerhards | 2012-07-24 | 1 | -6/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | ... it could pass a NULL pointer to unlink. Depending on OS implementation, this could (or could not...) lead to a segfault. | ||||
| * | | | | bugfix: DA queue could cause abort | Rainer Gerhards | 2012-07-24 | 1 | -3/+5 |
| | |_|/ | |/| | | | | | | | | | | | | | | ...due to invalid mutex synchronisation in DA worker. In case of idle queue, mutex was incorrectly locked. | ||||
* | | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-29 | 3 | -2/+3 |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h | ||||
| * | | | Merge branch 'master-elasticsearch' into tmp | Rainer Gerhards | 2012-06-29 | 3 | -2/+3 |
| |\ \ \ | |||||
| | * | | | property replacer lost one char when json escaping was necessary | Rainer Gerhards | 2012-05-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | The character immediately in front of the first escape was lost. | ||||
| | * | | | omelasticsearch: provide authentication support (UNTESTED) | Rainer Gerhards | 2012-04-25 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Merge branch 'master' into master-elasticsearch | Rainer Gerhards | 2012-04-23 | 12 | -159/+438 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/omelasticsearch/omelasticsearch.c | ||||
| | * | | | | permitting plugins to use three string requests | Rainer Gerhards | 2012-04-13 | 2 | -4/+8 |
| | | | | | | |||||
| | * | | | | omelasticsearch: used new property replacer options for default template | Rainer Gerhards | 2012-04-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | makes JSON creation far more bulletproof (and also faster) | ||||
| * | | | | | improve invalid config command error message | Rainer Gerhards | 2012-06-27 | 1 | -1/+2 |
| | | | | | | |||||
* | | | | | | provide support to dynamically enable/disable legacy conf command | Rainer Gerhards | 2012-06-26 | 3 | -8/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | most important to prevent clashes with new style settings | ||||
* | | | | | | modules: call new-style entry point only when new-style stmt is used | Rainer Gerhards | 2012-06-26 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This provides a way for modules to differentiate between old- and new- style config, so that they can react accordingly. | ||||
* | | | | | | cleanup & fix of mini-leak | Rainer Gerhards | 2012-06-25 | 1 | -2/+0 |
| | | | | | | |||||
* | | | | | | implemented freeCnf() module interface & fixed some mem leaks | Rainer Gerhards | 2012-06-25 | 5 | -9/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The interface was actually not present in older versions, even though some modules already used it. The implementation was now done, and not in 6.3/6.4 because the resulting memory leak was ultra-slim and the new interface handling has some potential to seriously break things. Not the kind of thing you want to add in late beta state, if avoidable. | ||||
* | | | | | | milestone: module() config statement basically works | Rainer Gerhards | 2012-06-21 | 6 | -30/+88 |
| | | | | | | | | | | | | | | | | | | | | | | | | some nits to iron out, only omfile actually support module params | ||||
* | | | | | | milestone: module() can load module in legacy mode | Rainer Gerhards | 2012-06-20 | 5 | -12/+65 |
| | | | | | | |||||
* | | | | | | fixing memory leaks in expression-based filters | Rainer Gerhards | 2012-06-14 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | most recently added by re_match() function | ||||
* | | | | | | milestone: regex is compiled from script based filter | Rainer Gerhards | 2012-06-12 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-11 | 1 | -4/+13 |
|\| | | | | | |||||
| * | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-06-11 | 1 | -4/+13 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * \ \ \ \ | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-06-11 | 1 | -4/+8 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | | * | | | | bugfix: "last message repeated n times" message was missing hostname | Rainer Gerhards | 2012-06-11 | 1 | -4/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Zdenek Salvet for finding this bug and to Bodik for reporting | ||||
| | * | | | | | bugfix: did not compile under solaris due to $uptime property code | Rainer Gerhards | 2012-06-08 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the time being, $uptime is not supported on Solaris |