| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-04-07 | 1 | -2/+3 |
| |\ | | | | | | | | | | | Conflicts: configure.ac doc/manual.html | ||||
| | * | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-07 | 1 | -2/+3 |
| | |\ | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| | | * | bugfix: memory leak in array passing output module mode | Rainer Gerhards | 2012-03-17 | 1 | -2/+3 |
| | | | | |||||
| * | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-12 | 1 | -0/+6 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/imuxsock.html doc/manual.html runtime/queue.c | ||||
| | * | | queue: lightdelay config: keep default of 70% until mark is explicitely set | Rainer Gerhards | 2012-02-22 | 1 | -3/+5 |
| | | | | |||||
| | * | | added configuration directives to customize queue light delay marks | Rainer Gerhards | 2012-02-21 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | $MainMsgQueueLightDelayMark, $ActionQueueLightDelayMark; both specify number of messages starting at which a delay happens. | ||||
| | * | | stats: generate friendly name for action queues, if possible | Rainer Gerhards | 2012-01-31 | 1 | -2/+7 |
| | | | | |||||
| * | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-01-27 | 1 | -3/+4 |
| |\| | | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| | * | | bugfix: action stats did invalidly contain already-discarded messages | Rainer Gerhards | 2012-01-27 | 1 | -3/+4 |
| | | | | |||||
| * | | | Merge branch 'v5-stable-elasticsearch' into v5-devel-tmp | Rainer Gerhards | 2012-01-17 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tools/syslogd.c | ||||
| | * | | | add JSON escaping option | Nathan Scott | 2012-01-17 | 1 | -1/+1 |
| | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following the path taken by the two SQL formatting options, which escape single quotes with double quotes (amongst other things), this patch adds a JSON quoting option. JSON is the opposite to the SQL options, requiring double quotes to be quoted within a string. This patch provides a formatting option implementing this requirement, while piggy-backing on the existing code as much as possible. Signed-off-by: Nathan Scott <nathans@aconex.com> | ||||
| * | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2011-12-19 | 1 | -3/+6 |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: configure.ac | ||||
| | * | | better performance for action stats & cleanup: removing debug prints | Rainer Gerhards | 2011-12-19 | 1 | -3/+6 |
| | | | | |||||
| * | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2011-12-19 | 1 | -0/+5 |
| |\| | | |||||
| | * | | additional counter for lost messages due to failed actions added | Rainer Gerhards | 2011-12-19 | 1 | -0/+5 |
| | | | | |||||
| * | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2011-12-19 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c | ||||
| | * | | added instrumentation | Rainer Gerhards | 2011-12-19 | 1 | -3/+45 |
| | |/ | |||||
| | * | 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> | ||||
| * | | | | fixing memory leak in new stats code (delete statsobj) | Rainer Gerhards | 2011-12-16 | 1 | -0/+6 |
| | | | | | |||||
| * | | | | experimental: added first stats counter to action object | Rainer Gerhards | 2011-12-16 | 1 | -6/+43 |
| | | | | | |||||
| * | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-10-17 | 1 | -10/+9 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | | | 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 v5-devel | 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 v5-devel | Andre Lorbach | 2011-08-18 | 1 | -2/+15 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: 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 v5-devel | Rainer Gerhards | 2011-06-21 | 1 | -8/+12 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | | bugfix: problems in failover action handling | Rainer Gerhards | 2011-06-20 | 1 | -8/+12 |
| | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=254 | ||||
| * | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-06-16 | 1 | -47/+125 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h | ||||
| | * | | | 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!) | ||||
| * | | | | preparing for 5.9.0v5.9.0 | Rainer Gerhards | 2011-06-10 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | set queue name to aciton name (useful for impstats!) | Rainer Gerhards | 2011-06-07 | 1 | -1/+6 |
| |/ / / | | | | | | | | | | so far untested, test follows | ||||
| * | | | 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 | ||||
| * | | | | 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 | ||||
| * | | | | 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. | ||||
| * | | | 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: 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). | ||||
 |
index : rsyslog.git | |
| rsyslog development for Lumberjack - various unofficial and potentially rebased branches | Miloslav Trmac |
| summaryrefslogtreecommitdiffstats |