summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\|
| * 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
* | 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.
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-126-136/+171
|\| | | | | | | | | Conflicts: ChangeLog
| * 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>
| * Allocate LocalDomain as new stringMarius Tomaschewski2012-04-111-0/+3
| | | | | | | | | | | | | | | | LocalDomain points to "" or the domain in LocalHostName, allocate as new string before passing to SetLocalDomain or free will fail later. Signed-off-by: Marius Tomaschewski <mt@suse.com>
| * doc: credits update for last bugfixRainer Gerhards2012-04-111-1/+2
| |
| * bugfix: hostname was not requeried on HUPRainer Gerhards2012-04-115-125/+161
| | | | | | | | Thanks to Marius Tomaschewski for reporting this bug.
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-073-5/+19
|\| | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * preparing for 5.8.10v5.8.10Rainer Gerhards2012-04-073-3/+3
| |
| * bugfix: segfault on startup if $actionqueuefilename was missing for disk ↵Tomas Heinrich2012-04-052-1/+5
| | | | | | | | | | | | queue config Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * doc: noted disk queue format change from v4->v5Rainer Gerhards2012-04-051-0/+5
| |
| * bugfix: segfault if disk-queue was started up with old queue fileTomas Heinrich2012-04-052-3/+8
| | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-174-4/+219
|\| | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * bugfix: memory leak in array passing output module modeRainer Gerhards2012-03-172-2/+6
| |
| * preparing for 5.8.9v5.8.9Rainer Gerhards2012-03-153-3/+3
| |
| * added tool to recover disk queue if .qi file is missing (recover_qi.pl)Kaiwang Chen2012-03-153-1/+211
| |
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-146-39/+67
|\|
| * changed statsobj interface and added better docRainer Gerhards2012-03-146-39/+67
| |
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-124-3/+18
|\| | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * bugfix: stopped DA queue was never processed after a restartRainer Gerhards2012-03-124-2/+15
| | | | | | | | ...due to a regression from statistics module.
| * preparing for 5.8.8v5.8.8Rainer Gerhards2012-03-053-3/+3
| |
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-022-2/+6
|\|
| * Fix for "/run/systemd/journal/syslog" detectionMarius Tomaschewski2012-03-021-2/+5
| | | | | | | | | | Changed to check "/run/systemd/journal" directory and not the socket, as the socket may not exists [e.g. is not activated].
| * Install syslog.service Alias for newer systemd versionsMichael Biebl2012-03-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From the syslog.socket unit file of newer systemd versions: The default syslog implementation should make syslog.service a symlink to itself, so that this socket activates the right actual syslog service. Examples: /etc/systemd/system/syslog.service -> /lib/systemd/system/rsyslog.service /etc/systemd/system/syslog.service -> /lib/systemd/system/syslog-ng.service Best way to achieve that is by adding this to your unit file (i.e. to rsyslog.service or syslog-ng.service): [Install] Alias=syslog.service http://cgit.freedesktop.org/systemd/systemd/tree/units/syslog.socket#n26
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-011-0/+9
|\|
| * Detect if to use /run/systemd/journal/syslog under systemdMarius Tomaschewski2012-03-011-0/+9
| | | | | | | | | | | | | | Detect if we have to use the new /run/systemd/journal/syslog socket instead of the /dev/log under newer systemd versions. Signed-off-by: Marius Tomaschewski <mt@suse.com>
* | mentioned imported bugfix in ChangeLogRainer Gerhards2012-03-011-0/+2
| |
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-012-2/+4
|\|
| * bugfix: imklog invalidly computed facility and severityRainer Gerhards2012-03-012-2/+4
| | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=313
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-02-031-16/+14
|\|
| * Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-02-031-16/+14
| |\
| | * ommysql: put under ASL 2.0Rainer Gerhards2012-02-031-16/+14
| | | | | | | | | | | | after getting OK via email from contributor Ariel P. (2012-02-02 22:06 CET)
* | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-02-010-0/+0
|\| |
generated by cgit (git 2.34.1) at 2024-05-08 12:09:58 +0000