summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add capability to configure outname for constant (inside template)Rainer Gerhards2012-08-254-22/+15
| | | | also some cleanup
* milestone: LIST-type templates support full option setRainer Gerhards2012-08-252-5/+77
|
* milestone: LIST-type template now only missing regex supportRainer Gerhards2012-08-251-0/+41
|
* milestone: LIST-type templates work, but no all options yet presentRainer Gerhards2012-08-254-13/+291
|
* milestone: base plumbing for LIST-type templates mostly in placeRainer Gerhards2012-08-255-18/+106
|
* Merge branch 'master' into master-newtemplateRainer Gerhards2012-08-2523-109/+238
|\
| * Merge branch 'v6-stable'Rainer Gerhards2012-08-2523-110/+239
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac runtime/ruleset.c tools/syslogd.c
| | * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-08-2521-105/+193
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-253-30/+48
| | | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: template.c
| | | | * change template.[ch] to ASL 2.0, removing a GPLv3-only patchRainer Gerhards2012-08-253-30/+48
| | | | | | | | | | | | | | | | | | | | | | | | | see template.c file header for details Note that this functionality was almost never used in practice
| | | * | preparing for 5.10.0 releaseRainer Gerhards2012-08-224-4/+11
| | | | |
| | | * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-08-221-2/+6
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | | | * preparing for 5.8.13 releaseRainer Gerhards2012-08-223-3/+3
| | | | |
| | | | * 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-226-18/+119
| | | |\| | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/ruleset.c
| | | | * bugfix: multiple main queues with same queue file name were not detectedRainer Gerhards2012-08-223-3/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2214-46/+45
| | | | | | | | | | | | | | | | | | | | This is done to prevent name claches with libraries.
| | * | | Merge branch 'beta' into v6-stableRainer Gerhards2012-08-20211-11720/+15449
| | |\ \ \
| | | * | | nitfix: status indication (now: stable) was invalid in ChangeLogRainer Gerhards2012-08-201-1/+1
| | | | | |
| | | * | | Merge branch 'v5-stable' into betaRainer Gerhards2012-08-203-3/+61
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | 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-012-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | some more elaborate patch is needed and will be provided
| | | | * | bugfix: potential abort if output plugin logged message during shutdownRainer Gerhards2012-08-012-7/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | note that none of the rsyslog-provided plugins does this Thanks to bodik and Rohit Prasad for alerting us on this bug and analyzing it. fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=347
| | | | * | bugfix: DA queue fixed handling of bad queue files.Andre Lorbach2012-07-312-1/+5
| | | | | |
| | | * | | preparing for 6.4.0 releaseRainer Gerhards2012-08-203-3/+6
| | | | | |
| | * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-07-243-9/+10
| | |\ \ \ \ | | | | |/ / | | | |/| |
* | | | | | v6 config/templates: legacy types are now supported via template()Rainer Gerhards2012-08-253-3/+180
| | | | | |
* | | | | | add base plumbing for template() config object to grammarRainer Gerhards2012-08-244-2/+33
|/ / / / /
* | | | | Fix printing of some template optionsMiloslav Trmač2012-08-211-1/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | | | doc: add imported patch to ChangeLogRainer Gerhards2012-08-211-0/+2
| | | | |
* | | | | Fix undefined ctxee problemMilan Bartos2012-08-211-2/+4
| | | | | | | | | | | | | | | | | | | | modified: plugins/imuxsock/imuxsock.c
* | | | | update documentation for parsing trusted propertiesMilan Bartos2012-08-211-0/+2
| | | | |
* | | | | Add support for parsing trusted propertiesMilan Bartos2012-08-211-30/+121
| | | | | | | | | | | | | | | | | | | | | | | | | * add support for parsing trusted properties into libee event structure * add $SystemLogParseTrusted config file option to enable it (default off)
* | | | | Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslogRainer Gerhards2012-08-022-1/+8
|\ \ \ \ \
| * \ \ \ \ Merge branch 'beta'Rainer Gerhards2012-08-012-1/+8
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | doc: add last patch to ChangelogRainer Gerhards2012-08-011-0/+3
| | | | | |
| | * | | | fix problem with cutting first 16 characters from message with bAnnotate on ↵Milan Bartos2012-08-011-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | modified: plugins/imuxsock/imuxsock.c
* | | | | | doc: added last patch to ChangeLogRainer Gerhards2012-07-311-0/+2
| | | | | |
* | | | | | Fix $SystemLogSocketAnnotateMiloslav Trmač2012-07-311-3/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Copy bAnnotateSysSock value from old config data into the new structure * Set bUseCreds on the system log socket if bAnnotateSysSock is set * Process all CMSG records, not only the first one Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | | | imzmq3: Added the return call to runInputDavid Kelly2012-07-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Just to be sure that nothing unfortunate would happen, possible that housekeeping would not get done without this.
* | | | | BAT-40 Found leak in imzmq3 pluginDavid Kelly2012-07-311-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | For some reason I forgot to free() the buffer that comes back from zstr_recv(). Doh!
* | | | | doc: improved doc for built-in modulesFlorian Riedl2012-07-247-24/+443
| | | | |
* | | | | Merge branch 'beta'Rainer Gerhards2012-07-2410-60/+257
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| * | | | bugfix: imptcp aborted when $InputPTCPServerBindRuleset was usedRainer Gerhards2012-07-242-1/+2
| | | | |
| * | | | Merge branch 'v5-stable' into betaRainer Gerhards2012-07-243-9/+10
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | omelasticsearch: regression from "parent" feature could case abortsRainer Gerhards2012-07-111-23/+26
| | | | | | | | | | | | | | | | | | | | this was not present in any released version
| * | | | bugfix: imtcp aborted when more than 2 connections were used.Andre Lorbach2012-07-114-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Incremented pthread stack size to 4MB for imtcp, imptcp and imttcp closes: http://bugzilla.adiscon.com/show_bug.cgi?id=342
| * | | | omelasticsearch: support for parameters parent & dynparent addedRainer Gerhards2012-07-102-20/+98
| | | | |