summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* bugfix: missing support for escape sequences in RainerScriptRainer Gerhards2012-09-135-2/+162
| | | | | | | Only \' was supported. Now the usual set is supported. Note that v5 used \x as escape where x was any character (e.g. "\n" meant "n" and NOT LF). This also means there is some incompatibility to v5 for well-know sequences. Better break it now than later.
* nit: correct messed-up ChangeLogRainer Gerhards2012-09-121-3/+5
|
* Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-122-5/+11
|\ | | | | | | | | Conflicts: ChangeLog
| * remove unused variables (if SCM_CREDENTIALS is not available)Cristian Ionescu-Idbohrn2012-09-122-1/+9
| |
| * imuxsock: remove incorrect socket option callCristian Ionescu-Idbohrn2012-09-121-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SCM_CREDENTIALS is not a socket option; its value is usually 0x2 which on most archs corresponds to socket option SO_REUSEADDR, but on mips-arch there is no socket option with value 0x2 and SO_REUSEADDR = 0x4, so the call will fail with ENOPROTOOPT 'Protocol not available'; skip it. There does not seem any other special setsockopt call is needed anyway, besides the above. In addition Jonny Törnbom commented: SCM_CREDENTIALS is a control message type, not a socket option, so using setsockopt(...SCM_CREDENTIALS...) is potentially dangerous and wrong and should be deleted from the code. (SCM_CREDENTIALS is used in conjuction with SO_PASSCRED which is the socket option to use.)
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-111-3/+1
|\|
| * fix compile problem on FreeBSDBrad Davis2012-09-111-3/+1
| |
* | preparing for 6.4.1 releaseRainer Gerhards2012-09-064-7/+9
| |
* | Fixed TCP CheckConnection handling in omfwd.c.Andre Lorbach2012-08-257-9/+30
| | | | | | | | Interface needed to be changed in lower stream classes. Syslog TCP Sending is now resumed properly.
* | bugfix: omusrsmsg incorrect return state & config warning handlingRainer Gerhards2012-08-283-2/+26
| | | | | | | | | | | | | | | | | | | | | | During config file processing, Omusrmsg often incorrectly returned a warning status, even when no warning was present (caused by uninitialized variable). Also, the core handled warning messages incorrectly, and treated them as errors. As a result, omusrmsg (most often) could not properly be loaded. Note that this only occurs with legacy config action syntax. This was a regression caused by an incorrect merge in to the 6.3.x codebase. Thanks to Stefano Mason for alerting us of this bug.
* | doc: add incompatible patch info to ChangeLogRainer Gerhards2012-08-261-0/+12
| |
* | INCOMPATIBLE: Return {} for missing $!all-jsonMiloslav Trmač2012-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | %$!all-json% will return a {}-wrapped object if there are are any events, or when there is an attached (empty) pMsg->event, but an empty string if nothing is attached. Let it return an empty object "{}" in that case for consistency. In particular, this allows $template MongoTemplate,"{%hostname:::jsonf:sys%, %$!all-json:2:$:%" to always result in a valid JSON. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | INCOMPATIBLE: use :, not =, as separator for jsonfMiloslav Trmač2012-08-262-2/+2
| | | | | | | | | | | | | | JSON fields are "name":value, not "name"=value. Therefore change the jsonf flag to use a colon. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | Remove a no-effect ", NULL";Miloslav Trmač2012-08-261-1/+1
| | | | | | | | | | | | It does nothing, at is just confusing. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | Fix printing of some template optionsMiloslav Trmač2012-08-261-1/+4
| | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | cleanup: remove left-over commented-out codeRainer Gerhards2012-08-251-10/+0
| |
* | 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 'v5-stable' into v5-betaRainer Gerhards2012-06-154-13/+10
| |\ \
| * \ \ Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-113-5/+15
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
* | \ \ \ 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
| | | | | |
| * | | | | 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
| * | | | | 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
| | | | | |
| * | | | | omelasticsearch: implement retry via request to es server homepageRainer Gerhards2012-07-101-10/+60
| | | | | |
| * | | | | omelasticsearch: better debug instrumentationRainer Gerhards2012-07-092-17/+33
| | | | | |
| * | | | | 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-053-3/+28
| | | | | |
| * | | | | preparing for 6.3.12v6.3.12Rainer Gerhards2012-07-023-5/+3
| | | | | |
generated by cgit (git 2.34.1) at 2024-10-06 02:34:42 +0000