summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v6-stable'Rainer Gerhards2012-05-035-18/+129
|\ | | | | | | | | Conflicts: tools/syslogd.c
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-05-036-19/+120
| |\ | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * preparing for 5.8.11 releasev5.8.11Rainer Gerhards2012-05-033-3/+3
| | |
| | * ommysql: added support for new mysql_library_[init/exit]Rainer Gerhards2012-05-032-1/+27
| | |
| | * bugfix: ommysql did not properly init/exit the mysql runtime libraryRainer Gerhards2012-05-032-1/+14
| | | | | | | | | | | | | | | | | | | | | This could lead to segfaults. Triggering condition: multiple action instances using ommysql. Thanks to Tomas Heinrich for reporting this problem and providing an initial patch (which my solution is based on, I need to add more code to clean the mess up).
| | * bugfix: rsyslog did not terminate when delayable inputs were blockedRainer Gerhards2012-05-032-5/+47
| | | | | | | | | | | | | | | | | | | | | ...due to unvailable sources. Fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=299 Thanks to Marcin M for bringing up this problem and Andre Lorbach for helping to reproduce and fix it.
| | * bugfix: inside queue.c, some thread cancel states were not correctly reset.Rainer Gerhards2012-05-032-5/+8
| | | | | | | | | | | | | | | | | | While this is a bug, we assume it did have no practical effect because the reset as it was done was set to the state the code actually had at this point. But better fix this...
| | * debug: slightly improved debug info for input module startupRainer Gerhards2012-05-031-0/+1
| | |
| | * bugfix: active input in "light delay state" could block rsyslog terminationRainer Gerhards2012-04-272-0/+6
| | | | | | | | | | | | at least for prolonged period of time...
| | * doc: correcting sample section of omudpspoofRainer Gerhards2012-04-201-8/+8
| | | | | | | | | | | | again, credits to Jo Rhett for reporting this issue
| | * doc: omudpspoof doc had invalid directivesRainer Gerhards2012-04-201-2/+2
| | | | | | | | | | | | Thanks to Jo Rhett for reporting the bug.
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-192-2/+4
| |\|
* | | bugfix/omfile: template action parameter was not acceptedRainer Gerhards2012-05-032-1/+4
| | | | | | | | | | | | | | | (and template name set to "??" if the parameter was used) Thanks to Brian Knox for alerting us on this bug.
* | | better debug instrumentation --> input thread names used for reportingRainer Gerhards2012-05-023-8/+32
| | |
* | | Merge branch 'master-fieldext'Rainer Gerhards2012-04-265-63/+97
|\ \ \
| * | | added capability to specify substrings for field extraction modeRainer Gerhards2012-04-265-63/+97
| | | |
* | | | cleanup: removed unused but set parametersRainer Gerhards2012-04-235-10/+4
| | | |
* | | | bugfix: omudpspoof did not work correctly if no spoof hostname was configuredRainer Gerhards2012-04-232-1/+3
| | | |
* | | | bugfix: number conversion in expression evaluation was not always correctRainer Gerhards2012-04-231-2/+4
|/ / / | | | | | | | | | | | | was invalid when the property was no string. Currently all props are strings, so this bug never could hit in practice.
* | | Merge branch 'v5-beta'Rainer Gerhards2012-04-191-0/+4
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: plugins/imptcp/imptcp.c
| * \ \ Merge branch 'v5-stable-newstats' into v5-betaRainer Gerhards2012-04-192-2/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| | * \ \ Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-191-0/+2
| | |\ \ \ | | | | |/ | | | |/|
| | | * | doc: added last bugfix to ChangeLogRainer Gerhards2012-04-191-0/+2
| | | | |
| | | * | bugfix: imptcp input name could not be setRainer Gerhards2012-04-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix: imptcp input name could not be set config directive was accepted, but had no effect
| | * | | doc: add last bugfix to changelogRainer Gerhards2012-04-192-1/+3
| | | | | | | | | | | | | | | | | | | | and bump up version
| | * | | bugfix: imptcp input name could not be setRainer Gerhards2012-04-191-2/+2
| | | | | | | | | | | | | | | | | | | | config directive was accepted, but had no effect
| * | | | Merge branch 'v5-stable-newstats' into v5-betaRainer Gerhards2012-04-184-5/+45
| |\| | |
| | * | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-180-0/+0
| | |\| |
| | * | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-184-5/+45
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c
* | | | | | added the "jsonf" property replacer option (and fieldname) & bugfixRainer Gerhards2012-04-195-59/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix: property replacer option "json" could lead to content loss message was truncated if escaping was necessary
* | | | | | Merge branch 'v6-stable'Rainer Gerhards2012-04-186-5/+76
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c runtime/ruleset.c runtime/ruleset.h
| * | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-184-8/+45
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | fixed compile bugRainer Gerhards2012-04-181-1/+1
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | actually a regression from last bugfix - I just wonder why the other machine did not complain :-S
| | * | | bugfix: assigned ruleset was lost when using disk queuesRainer Gerhards2012-04-184-8/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This looked quite hard to diagnose for disk-assisted queues, as the pure memory part worked well, but ruleset info was lost for messages stored inside the disk queue.
| * | | | doc: added new $uptime propertyRainer Gerhards2012-04-131-0/+4
| | | | |
| * | | | Add a system property, PROP_SYS_UPTIME, to place up-time markers into ↵Steven A. Falco2012-04-132-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rsyslog output. Here is an example template, where this is used: $template CoincidentFileFormat,"[UP=%$uptime%sec] %TIMESTAMP% %HOSTNAME% %syslogtag%%msg:::sp-if-no-1st-sp%%msg:::drop-last-lf%\n" and here is an example line of output using the above template: [UP=20sec] Apr 12 21:50:00 atom kernel: imklog 5.8.7, log source = /proc/kmsg started.
* | | | | bugfix/imuxsock: configured hostname was not usedRainer Gerhards2012-04-162-1/+3
| | | | |
* | | | | bugfix/imuxsock: solving abort if hostname was not setRainer Gerhards2012-04-162-2/+5
| | | | |
* | | | | make "old" omelasticsearch compileRainer Gerhards2012-04-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | this module is to be replaced by branch currently in development. But I want to be able to compile the previous one, at least ;)
* | | | | preparing for 6.3.8 releasev6.3.8Rainer Gerhards2012-04-161-1/+1
| | | | |
* | | | | bugfix: report error if module tries to request more strings than supportedRainer Gerhards2012-04-132-4/+8
| | | | |
* | | | | imuxsock: mini bugfix: closed fd was tried to close a second timeRainer Gerhards2012-04-131-3/+6
| | | | |
* | | | | Merge branch 'v6-stable'Rainer Gerhards2012-04-120-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-126-136/+171
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
* | | | | Merge branch 'v5-beta'Rainer Gerhards2012-04-129-138/+210
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c tools/syslogd.c
| * | | | preparing for 5.9.6v5.9.6Rainer Gerhards2012-04-124-9/+15
| | | | |
| * | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-126-120/+168
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-126-120/+168
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/glbl.c
| | | * | imuxsock: do not cache hostnameRainer Gerhards2012-04-122-11/+5
| | | | |
| | | * | Free also LocalDomain in glbl class destructorMarius Tomaschewski2012-04-111-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Marius Tomaschewski <mt@suse.com>
generated by cgit (git 2.34.1) at 2024-06-11 08:51:19 +0000