summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-131-78/+83
|\ | | | | | | | | Conflicts: runtime/rule.c
| * bugfix: invalid property name in property-filter could cause abortRainer Gerhards2012-09-131-56/+63
| | | | | | | | | | | | ...if action chaining (& operator) was used http://bugzilla.adiscon.com/show_bug.cgi?id=355 Thanks to pilou@gmx.com for the bug report
* | Fixed TCP CheckConnection handling in omfwd.c.Andre Lorbach2012-08-255-8/+17
| | | | | | | | 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-281-2/+16
| | | | | | | | | | | | | | | | | | | | | | 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.
* | 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-261-1/+1
| | | | | | | | | | | | | | 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>
* | 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
| | | |
* | | | Merge branch 'v5-stable' into betaRainer 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.
* | | 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 '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
| | | | |
* | | | | 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
| * | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-065-33/+26
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-013-13/+17
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'v5-beta' into betaRainer Gerhards2012-06-065-33/+26
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: runtime/modules.c
| * | | | | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-065-33/+26
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/modules.c
| | * | | | | bugfix: property PROCID was empty instead of proper nilvalue if not presentRainer Gerhards2012-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If it is not present, it must have the nilvalue "-" as of RFC5424 closes: http://bugzilla.adiscon.com/show_bug.cgi?id=332 Thanks to John N for reporting this issue.
| | * | | | | bugfix: potential hang due to mutex deadlockRainer Gerhards2012-06-063-29/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=316 Thanks to Andreas Piesk for reporting&analyzing this bug as well as providing patches and other help in resolving it.
| | * | | | | fixing memleak in recent group resolve patchRainer Gerhards2012-06-061-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | also added some error checking
| | * | | | | call getgrnam_r repeatedly to get all group members.Alec Warner2012-06-061-3/+12
| | | |/ / / | | |/| | |
* | | | | | fixing small memleak during config read phaseRainer Gerhards2012-06-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | traditional system line buffers were not freed. semi-static memory leak during config load phase, did not grow while processing messages. Usually less than 5k during the whole runtime.
* | | | | | Merge branch 'v5-beta' into betaRainer Gerhards2012-06-011-10/+16
|\| | | | |
| * | | | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-011-10/+16
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/queue.c
| | * | | | some better code to handle queue congestionRainer Gerhards2012-06-011-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a minor optimization to spare some cycles if the timeout is set to immediate discard
* | | | | | Merge branch 'v5-beta' into betaRainer Gerhards2012-05-292-3/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-15 18:26:15 +0000