| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-06-11 | 1 | -1/+1 |
| |\ | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | bugfix: "last message repeated n times" message was missing hostname | Rainer Gerhards | 2012-06-11 | 1 | -1/+1 |
| | | | | | | | | | Thanks to Zdenek Salvet for finding this bug and to Bodik for reporting | ||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-06-01 | 1 | -1/+1 |
| |\| | |||||
| | * | bugfix: delayble source could block action queue, ... | Rainer Gerhards | 2012-06-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | 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 v6-stable | Rainer Gerhards | 2012-03-17 | 1 | -2/+3 |
| |\| | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | bugfix: memory leak in array passing output module mode | Rainer Gerhards | 2012-03-17 | 1 | -2/+3 |
| | | | |||||
| * | | undoing v6.1 config scoping interface, part I | Rainer Gerhards | 2012-01-18 | 1 | -31/+31 |
| | | | | | | | | | The most common files are now changed, more needs to be done. | ||||
| * | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-12-01 | 1 | -1/+1 |
| |\| | |||||
| | * | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-12-01 | 1 | -1/+1 |
| | |\ | | | | | | | | | | | | | Conflicts: action.c | ||||
| | | * | Merge branch 'v3-stable' into v4-stable | Rainer Gerhards | 2011-12-01 | 1 | -1/+1 |
| | | |\ | |||||
| | | | * | bugfix: action resume interval incorrectly handled, thus took longer to resume | Tomas Heinrich | 2011-12-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-17 | 1 | -10/+9 |
| |\| | | | |||||
| | * | | | Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stable | Rainer Gerhards | 2011-10-17 | 1 | -1/+0 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | | * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-13 | 1 | -1/+0 |
| | | |\| | | |||||
| | | | * | | bugfix: $ActionExecOnlyOnce interval did not work properly | Tomas Heinrich | 2011-10-13 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| | * | | | | bugfix: ActionQueue could malfunction due to index error | Vlad Grigorescu | 2011-10-17 | 1 | -9/+9 |
| | |/ / / | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-08-31 | 1 | -25/+23 |
| |\| | | | |||||
| | * | | | bugfix: mark message processing did not work correctly | Rainer Gerhards | 2011-08-31 | 1 | -25/+23 |
| | | | | | |||||
| * | | | | Merge branch 'v5-stable' into beta | Andre Lorbach | 2011-08-18 | 1 | -2/+15 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | ||||
| | * | | | removed debug code from action.c and runtime/queue.c after testing | Andre Lorbach | 2011-08-18 | 1 | -17/+0 |
| | | | | | |||||
| | * | | | bugfix: fixed incorrect state handling for Discard Action (transactions) | Andre Lorbach | 2011-08-18 | 1 | -2/+32 |
| | | | | | |||||
| * | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-06-21 | 1 | -47/+129 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh tests/sndrcv_drvr.sh | ||||
| | * | | | bugfix: problems in failover action handling | Rainer Gerhards | 2011-06-20 | 1 | -8/+12 |
| | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=254 | ||||
| | * | | | failover problem was not totally solved, now (hopefully ;)) | Rainer Gerhards | 2011-06-16 | 1 | -27/+59 |
| | | | | | | | | | | | | | | | | | I overlooked a border case, which came up on a larger testbench run. | ||||
| | * | | | bugfix: problems in failover action handling | Rainer Gerhards | 2011-06-16 | 1 | -47/+93 |
| | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=270 (not yet confirmed!) | ||||
| * | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-03-31 | 1 | -31/+111 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html doc/rsyslog_conf.html runtime/msg.c runtime/rsyslog.h template.c | ||||
| | * | | | bugfix: error return from strgen caused abort, now causes action to be ignored | Rainer Gerhards | 2011-03-29 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | ...(just like a failed filter) | ||||
| | * | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2011-03-16 | 1 | -30/+109 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am | ||||
| | | * | | | fixed a regression of last patch and some cleanup | Rainer Gerhards | 2011-03-16 | 1 | -14/+4 |
| | | | | | | |||||
| | | * | | | bugfix: failover did not work correctly if repeated msg reduction was on | Rainer Gerhards | 2011-03-16 | 1 | -30/+119 |
| | | | | | | | | | | | | | | | | | | | | | affected directive was: $ActionExecOnlyWhenPreviousIsSuspended on | ||||
| | | * | | | bugfix(kind of): tell users that config graph can currently not be generated | Rainer Gerhards | 2011-03-08 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=232 | ||||
| * | | | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-03-11 | 1 | -1/+2 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/omlibdbi/omlibdbi.c tests/Makefile.am tests/diag.sh | ||||
| | * | | | | bugfix: discard action did not work under some circumstances | Rainer Gerhards | 2011-03-07 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=217 | ||||
| * | | | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-18 | 1 | -12/+13 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/glbl.c tools/omdiscard.c | ||||
| | * | | | | bugfix: minor race condition in action.c - considered cosmetic | Rainer Gerhards | 2011-02-17 | 1 | -12/+13 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | This is considered cosmetic as multiple threads tried to write exactly the same value into the same memory location without sync. The method has been changed so this can no longer happen. | ||||
| * | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-12-17 | 1 | -60/+72 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c runtime/glbl.c | ||||
| | * | | | bug fixes in action processing | Rainer Gerhards | 2010-12-17 | 1 | -49/+70 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - bugfix: action processor released mememory too early, resulting in potential issue in retry cases (but very unlikely due to another bug, which I also fixed -- only after the fix this problem here became actually visible). - bugfix: batches which had actions in error were not properly retried in all cases | ||||
| | * | | | used a bit more stack (irrelevant) to gain a bit more performance... | Rainer Gerhards | 2010-12-16 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | ... for large batches | ||||
| | * | | | bugfix: batch processing flagged invalid message as "bad" under some ↵ | Rainer Gerhards | 2010-12-16 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | circumstances also fixed some cosmetic nits | ||||
| * | | | | bugfix: potential abort when output modules with different parameter ... | Rainer Gerhards | 2010-12-03 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | ... passing modes were used in configured output modules | ||||
| * | | | | bugfix: memory leak if different passing modes were used in actions | Rainer Gerhards | 2010-12-01 | 1 | -0/+8 |
| | | | | | |||||
| * | | | | milestone: added support for CEE-properties in property-based filters | Rainer Gerhards | 2010-12-01 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-11-25 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h | ||||
| | * | | | bugfix: replacements for atomic operations for non-int sized types had problems. | Rainer Gerhards | 2010-11-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | At least one instance of that problem could potentially lead to abort (inside omfile). | ||||
| * | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-10-22 | 1 | -1/+1 |
| |\| | | | |||||
| | * | | | fixing a potentially uninitialized variablev5.6.0 | Rainer Gerhards | 2010-10-19 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' into newconf | Rainer Gerhards | 2010-08-05 | 1 | -0/+1 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: doc/manual.html | ||||
| | * | | | break potential infinite loop in actionDoRetry | Steffen Sledz | 2010-08-05 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a module always returns RS_RET_OK (like ompipe does) the actionDoRetry loop may not have leaved faked ACT_STATE_SUSP state in case iResumeOKinRow had ever reached a count of 1000. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | | | added support to save/restore rsyslog core action settings... | Rainer Gerhards | 2010-07-23 | 1 | -127/+190 |
| | | | | | | | | | | | | | | | | | | | | | ... but not those of plugins (which are at least as important as the core ones). So this is an interim commit. | ||||
| * | | | | moving towards scoping inside rsyslog.conf | Rainer Gerhards | 2010-07-21 | 1 | -29/+29 |
| |/ / / | | | | | | | | | | first step: adding object-type specifier to config statement table | ||||
 |
index : rsyslog.git | |
| rsyslog development for Lumberjack - various unofficial and potentially rebased branches | Miloslav Trmac |
| summaryrefslogtreecommitdiffstats |