summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Collapse)AuthorAgeFilesLines
* add capability to configure outname for constant (inside template)Rainer Gerhards2012-08-251-2/+2
| | | | also some cleanup
* milestone: LIST-type templates work, but no all options yet presentRainer Gerhards2012-08-251-5/+6
|
* milestone: base plumbing for LIST-type templates mostly in placeRainer Gerhards2012-08-251-0/+1
|
* Merge branch 'master' into master-newtemplateRainer Gerhards2012-08-2510-34/+71
|\
| * Merge branch 'v6-stable'Rainer Gerhards2012-08-2510-34/+71
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac runtime/ruleset.c tools/syslogd.c
| | * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-08-259-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-stableRainer Gerhards2012-08-251-0/+2
| | | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: template.c
| | | | * change template.[ch] to ASL 2.0, removing a GPLv3-only patchRainer Gerhards2012-08-251-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 versionRainer Gerhards2012-08-221-1/+1
| | | | |
| | | * | small bugfix: stream timeout API use was incorrectRainer Gerhards2012-08-221-2/+2
| | | | | | | | | | | | | | | | | | | | Thanks to Andre Lorbach for mentioning this.
| | | * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-08-224-14/+50
| | | |\| | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/ruleset.c
| | | | * bugfix: multiple main queues with same queue file name were not detectedRainer Gerhards2012-08-221-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/RSFALSERainer Gerhards2012-08-227-27/+26
| | | | | | | | | | | | | | | | | | | | This is done to prevent name claches with libraries.
| | | * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-111-4/+8
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | \ \ Merge branch 'v5-stable' into betaRainer Gerhards2012-08-201-0/+37
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | nitfix: remove quirck in new debug message codeRainer Gerhards2012-08-011-4/+2
| | | | | |
| | | * | | more elaborate debug logging for object deserializerRainer Gerhards2012-08-011-0/+39
| | | | | |
| | | * | | undo last queue patch - caused a regressionRainer Gerhards2012-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | some more elaborate patch is needed and will be provided
| | | * | | bugfix: DA queue fixed handling of bad queue files.Andre Lorbach2012-07-311-1/+1
| | | | | |
* | | | | | v6 config/templates: legacy types are now supported via template()Rainer Gerhards2012-08-251-2/+2
| | | | | |
* | | | | | add base plumbing for template() config object to grammarRainer Gerhards2012-08-241-0/+10
|/ / / / /
* | | | | Merge branch 'beta'Rainer Gerhards2012-07-243-2/+50
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| * | | | Merge branch 'v5-stable' into betaRainer Gerhards2012-07-242-9/+9
| |\| | |
| * | | | omelasticsearch: better debug instrumentationRainer Gerhards2012-07-091-2/+0
| | | | |
| * | | | debug log: cleaned up & streamlined queue param outputRainer Gerhards2012-07-051-20/+43
| | | | |
| * | | | debug log: emit (some) action queue parameters to debug logRainer Gerhards2012-07-052-0/+27
| | | | |
* | | | | Merge branch 'v5-stable'Rainer Gerhards2012-07-242-9/+9
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | bugfix: strm class could abort under some circumstancesRainer Gerhards2012-07-241-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 abortRainer Gerhards2012-07-241-3/+5
| | |_|/ | |/| | | | | | | | | | | | | | ...due to invalid mutex synchronisation in DA worker. In case of idle queue, mutex was incorrectly locked.
* | | | Merge branch 'beta'Rainer Gerhards2012-06-293-2/+3
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h
| * | | Merge branch 'master-elasticsearch' into tmpRainer Gerhards2012-06-293-2/+3
| |\ \ \
| | * | | property replacer lost one char when json escaping was necessaryRainer Gerhards2012-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | The character immediately in front of the first escape was lost.
| | * | | omelasticsearch: provide authentication support (UNTESTED)Rainer Gerhards2012-04-251-0/+1
| | | | |
| | * | | Merge branch 'master' into master-elasticsearchRainer Gerhards2012-04-2312-159/+438
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/omelasticsearch/omelasticsearch.c
| | * | | | permitting plugins to use three string requestsRainer Gerhards2012-04-132-4/+8
| | | | | |
| | * | | | omelasticsearch: used new property replacer options for default templateRainer Gerhards2012-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | makes JSON creation far more bulletproof (and also faster)
| * | | | | improve invalid config command error messageRainer Gerhards2012-06-271-1/+2
| | | | | |
* | | | | | provide support to dynamically enable/disable legacy conf commandRainer Gerhards2012-06-263-8/+33
| | | | | | | | | | | | | | | | | | | | | | | | most important to prevent clashes with new style settings
* | | | | | modules: call new-style entry point only when new-style stmt is usedRainer Gerhards2012-06-261-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-leakRainer Gerhards2012-06-251-2/+0
| | | | | |
* | | | | | implemented freeCnf() module interface & fixed some mem leaksRainer Gerhards2012-06-255-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 worksRainer Gerhards2012-06-216-30/+88
| | | | | | | | | | | | | | | | | | | | | | | | some nits to iron out, only omfile actually support module params
* | | | | | milestone: module() can load module in legacy modeRainer Gerhards2012-06-205-12/+65
| | | | | |
* | | | | | fixing memory leaks in expression-based filtersRainer Gerhards2012-06-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | most recently added by re_match() function
* | | | | | milestone: regex is compiled from script based filterRainer Gerhards2012-06-121-0/+1
| | | | | |
* | | | | | Merge branch 'beta'Rainer Gerhards2012-06-111-4/+13
|\| | | | |
| * | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-06-111-4/+13
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * \ \ \ \ Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-111-4/+8
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | * | | | bugfix: "last message repeated n times" message was missing hostnameRainer Gerhards2012-06-111-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 codeRainer Gerhards2012-06-081-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For the time being, $uptime is not supported on Solaris