Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-06-01 | 1 | -0/+7 |
|\ | | | | | | | | | Conflicts: runtime/queue.c | ||||
| * | bugfix: delayble source could block action queue, ... | Rainer Gerhards | 2012-06-01 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | even if there was a disk queue associated with it. The root cause of this problem was that it makes no sense to delay messages once they arrive in the action queue - the "input" that is being held in that case is the main queue worker, what makes no sense. Thanks to Marcin for alerting us on this problem and providing instructions to reproduce it. | ||||
* | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-05-29 | 1 | -0/+11 |
|\| | |||||
| * | bugfix: if debug message could end up in log file when forking | Tomas Heinrich | 2012-05-29 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | if rsyslog was set to auto-background (thus fork, the default) and debug mode to stdout was enabled, debug messages ended up in the first log file opened. Currently, stdout logging is completely disabled in forking mode (but writing to the debug log file is still possible). This is a change in behaviour, which is under review. If it causes problems to you, please let us know. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | bugfix/omudpspoof: problems, including abort, happend when run on multiple ↵ | Rainer Gerhards | 2012-05-14 | 1 | -0/+3 |
| | | | | | | | | | | | | | | threads. Root cause is that libnet is not thread-safe. Omudpspoof now guards libnet calls with their own mutex. | ||||
* | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-05-10 | 1 | -0/+9 |
|\| | | | | | | | | | Conflicts: ChangeLog | ||||
| * | bugfix: disk queue was not persisted on shutdown, regression of fix to | Rainer Gerhards | 2012-05-10 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | http://bugzilla.adiscon.com/show_bug.cgi?id=299 The new code also handles the case of shutdown of blocking light and full delayable sources somewhat smarter and permits, assuming sufficient timouts, to persist message up to the max queue capacity. Also some nits in debug instrumentation have been fixed. | ||||
* | | bugfix: disk queue was not persisted on shutdown, regression of fix to | Rainer Gerhards | 2012-05-10 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | http://bugzilla.adiscon.com/show_bug.cgi?id=299 The new code also handles the case of shutdown of blocking light and full delayable sources somewhat smarter and permits, assuming sufficient timouts, to persist message up to the max queue capacity. Also some nits debug instrumentation have been fixed. | ||||
* | | Merge branch 'v5-beta' of git+ssh://git.adiscon.com/git/rsyslog into v5-beta | Rainer Gerhards | 2012-05-10 | 1 | -1/+1 |
|\ \ | |||||
| * | | preparing for 5.9.7v5.9.7 | Rainer Gerhards | 2012-05-10 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-05-10 | 1 | -0/+1 |
|\ \ \ | |/ / |/| / | |/ | | | Conflicts: ChangeLog | ||||
| * | bugfix/tcpflood: sending small test files did not work correctly | Rainer Gerhards | 2012-05-10 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-05-03 | 1 | -1/+27 |
|\| | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | preparing for 5.8.11 releasev5.8.11 | Rainer Gerhards | 2012-05-03 | 1 | -1/+1 |
| | | |||||
| * | bugfix: ommysql did not properly init/exit the mysql runtime library | Rainer Gerhards | 2012-05-03 | 1 | -0/+5 |
| | | | | | | | | | | | | | | 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 blocked | Rainer Gerhards | 2012-05-03 | 1 | -0/+5 |
| | | | | | | | | | | | | | | ...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 Gerhards | 2012-05-03 | 1 | -0/+4 |
| | | | | | | | | | | | | 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... | ||||
| * | bugfix: active input in "light delay state" could block rsyslog termination | Rainer Gerhards | 2012-04-27 | 1 | -0/+2 |
| | | | | | | | | at least for prolonged period of time... | ||||
* | | cosmetic: new version in ChangeLog | Rainer Gerhards | 2012-04-27 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'v5-stable-field-substring' into v5-beta | Rainer Gerhards | 2012-04-27 | 1 | -0/+1 |
|\ \ | |||||
| * | | added capability to specify substrings for field extraction mode | Rainer Gerhards | 2012-04-27 | 1 | -0/+1 |
| |/ | |||||
* | | Merge branch 'v5-stable-newstats' into v5-beta | Rainer Gerhards | 2012-04-19 | 1 | -0/+4 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | ||||
| * | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-19 | 1 | -0/+2 |
| |\| | |||||
| | * | doc: added last bugfix to ChangeLog | Rainer Gerhards | 2012-04-19 | 1 | -0/+2 |
| | | | |||||
| * | | doc: add last bugfix to changelog | Rainer Gerhards | 2012-04-19 | 1 | -0/+2 |
| | | | | | | | | | | | | and bump up version | ||||
* | | | Merge branch 'v5-stable-newstats' into v5-beta | Rainer Gerhards | 2012-04-18 | 1 | -0/+4 |
|\| | | |||||
| * | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-18 | 1 | -0/+4 |
| |\| | | | | | | | | | | | | | Conflicts: runtime/msg.c | ||||
| | * | bugfix: assigned ruleset was lost when using disk queues | Rainer Gerhards | 2012-04-18 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | preparing for 5.9.6v5.9.6 | Rainer Gerhards | 2012-04-12 | 1 | -2/+5 |
| | | | |||||
* | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-04-12 | 1 | -0/+5 |
|\| | | |||||
| * | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-12 | 1 | -0/+5 |
| |\| | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/glbl.c | ||||
| | * | doc: credits update for last bugfix | Rainer Gerhards | 2012-04-11 | 1 | -1/+2 |
| | | | |||||
| | * | bugfix: hostname was not requeried on HUP | Rainer Gerhards | 2012-04-11 | 1 | -0/+4 |
| | | | | | | | | | | | | Thanks to Marius Tomaschewski for reporting this bug. | ||||
* | | | permit size modifiers (k,m,g,...) in integer config parameters | Rainer Gerhards | 2012-04-07 | 1 | -0/+2 |
| | | | | | | | | | | | | Thanks to Jo Rhett for the suggestion. | ||||
* | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-04-07 | 1 | -3/+12 |
|\| | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html | ||||
| * | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-07 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| | * | preparing for 5.8.10v5.8.10 | Rainer Gerhards | 2012-04-07 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-07 | 1 | -1/+11 |
| |\| | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| | * | bugfix: segfault on startup if $actionqueuefilename was missing for disk ↵ | Tomas Heinrich | 2012-04-05 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | queue config Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| | * | bugfix: segfault if disk-queue was started up with old queue file | Tomas Heinrich | 2012-04-05 | 1 | -0/+2 |
| | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| | * | bugfix: memory leak in array passing output module mode | Rainer Gerhards | 2012-03-17 | 1 | -0/+3 |
| | | | |||||
| | * | preparing for 5.8.9v5.8.9 | Rainer Gerhards | 2012-03-15 | 1 | -1/+1 |
| | | | |||||
| | * | added tool to recover disk queue if .qi file is missing (recover_qi.pl) | Kaiwang Chen | 2012-03-15 | 1 | -0/+2 |
| | | | |||||
| * | | milestone: added capability to use a local interface IP address as fromhost-ip | Rainer Gerhards | 2012-03-21 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | ... for locally originating messages. New directive $LocalHostIPIF. Note that not all modules yet support this new directive - next step... | ||||
* | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-20 | 1 | -0/+4 |
|\| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imptcp/imptcp.c | ||||
| * | | added configuration directive to disable octet-counted framing | Rainer Gerhards | 2012-03-20 | 1 | -0/+1 |
| | | | | | | | | | | | | for imptcp, directive is $InputPTCPServerSupportOctetCountedFraming | ||||
* | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-19 | 1 | -0/+3 |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imtcp/imtcp.c tcpsrv.h | ||||
| * | | added configuration directive to disable octet-counted framing | Rainer Gerhards | 2012-03-19 | 1 | -0/+2 |
| | | | | | | | | | | | | ... for imtcp, directive is $InputTCPServerSupportOctetCountedFraming | ||||
* | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-14 | 1 | -0/+3 |
|\| | | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| * | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-03-14 | 1 | -0/+3 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/queue.c runtime/queue.h |