Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-24 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/v7compatibility.html | |||||
| * | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-10-24 | 1 | -1/+1 | |
| |\| | | | ||||||
| | * | | | make rsyslog core suspened actions after 10 failures in a row | Rainer Gerhards | 2012-10-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | This was former the case after 1,000 failures and could cause rsyslog to be spammed/ressou | |||||
| * | | | | bugfix: segfault on startup when modules using MSG_PASSING mode are used | Rainer Gerhards | 2012-10-23 | 1 | -1/+4 | |
| | | | | | ||||||
* | | | | | remove "last message repeated n times" from rsyslog output part | Rainer Gerhards | 2012-10-23 | 1 | -126/+16 | |
|/ / / / | ||||||
* | | | | do "template date call" only when actually needed | Rainer Gerhards | 2012-10-11 | 1 | -1/+22 | |
| | | | | ||||||
* | | | | optimize: do "template time() call" only once per batch | Rainer Gerhards | 2012-10-10 | 1 | -5/+8 | |
|/ / / | | | | | | | | | | | | | | | | This still needs more optimizing as the call is very often NOT needed - but we need to know about the templates in that case. | |||||
* | | | fix invalid state handling during action execution | Rainer Gerhards | 2012-09-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | could lead to execution of not-to-be-executed action. very recent regression. | |||||
* | | | fix optimizer-introduced memleak in action destruction | Rainer Gerhards | 2012-09-25 | 1 | -1/+2 | |
| | | | ||||||
* | | | cleanup & better debug output | Rainer Gerhards | 2012-09-24 | 1 | -27/+0 | |
| | | | | | | | | | | | | | | | - removed no longer needed function - debug log now contains action type for action objects | |||||
* | | | Clean up implementation of omdiscard-->STOP optimization | Rainer Gerhards | 2012-09-24 | 1 | -1/+10 | |
| | | | ||||||
* | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-19 | 1 | -1/+16 | |
|\| | | ||||||
| * | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-19 | 1 | -1/+16 | |
| |\ \ | ||||||
| | * | | bugfix: potential abort, if action queue could not be properly started | Rainer Gerhards | 2012-09-19 | 1 | -1/+16 | |
| | | | | | | | | | | | | | | | | This most importantly could happen due to configuration errors. | |||||
* | | | | new ruleengine: fix memory leak | Rainer Gerhards | 2012-09-12 | 1 | -0/+3 | |
| | | | | ||||||
* | | | | new ruleengine: fixed action handling in regard to filters | Rainer Gerhards | 2012-09-12 | 1 | -72/+69 | |
|/ / / | | | | | | | | | | This was not yet adapted to the new "active" structure. | |||||
* | | | implement ACT_JSON_PASSING | Rainer Gerhards | 2012-08-29 | 1 | -12/+11 | |
| | | | | | | | | | | | | | | | NOTE: this is only compile-tested! For real testing, a module using that mode is required. Will be done as next steps. | |||||
* | | | add OMSR_TPL_AS_JSON mode for output modules (interface only) | Rainer Gerhards | 2012-08-29 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | | | This patch does NOT contain any implementation, this will happen next. Thanks to Miloslav Trmac, who suggested a similar mode, which I based the JSON idea on. | |||||
* | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-08-25 | 1 | -8/+8 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac runtime/ruleset.c tools/syslogd.c | |||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-08-25 | 1 | -8/+8 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/manual.html runtime/ruleset.c template.h threads.c tools/syslogd.c | |||||
| | * | changed TRUE/FALSE to RSTRUE/RSFALSE | Rainer Gerhards | 2012-08-22 | 1 | -7/+7 | |
| | | | | | | | | | | | | This is done to prevent name claches with libraries. | |||||
| | * | Merge branch 'v5-stable' into v5-beta | 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 'beta' | Rainer Gerhards | 2012-07-24 | 1 | -3/+1 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | |||||
| * | | | debug log: emit (some) action queue parameters to debug log | Rainer Gerhards | 2012-07-05 | 1 | -3/+1 | |
| | | | | ||||||
* | | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-29 | 1 | -1/+2 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h | |||||
| * | | | Merge branch 'master-elasticsearch' into tmp | Rainer Gerhards | 2012-06-29 | 1 | -1/+2 | |
| |\ \ \ | ||||||
| | * | | | omelasticsearch: added transactional interface & better debug output | Rainer Gerhards | 2012-05-24 | 1 | -1/+2 | |
| | | | | | ||||||
* | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-27 | 1 | -32/+0 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | |||||
| * | | | | cleanup: remove config scoping system left-over | Rainer Gerhards | 2012-06-27 | 1 | -28/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | this was an experiment in early v6 that did not work out. I forgot to remove this code when I undid it. | |||||
| * | | | | bugfix: $ActionName was not properly honored | Rainer Gerhards | 2012-06-27 | 1 | -4/+0 | |
| | | | | | | | | | | | | | | | | | | | | Thanks to Abby Edwards for alerting us. | |||||
* | | | | | change action queue default enqueue timeout from 2000ms to 50ms | Rainer Gerhards | 2012-06-01 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge branch 'v5-beta' into beta | Rainer Gerhards | 2012-06-01 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| / / | |/ / | ||||||
| * | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-06-01 | 1 | -1/+1 | |
| |\| | | | | | | | | | | | | | Conflicts: runtime/queue.c | |||||
| | * | 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-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 | |
| | | | | ||||||
* | | | | action cfg: do no longer require template for TPL_AS_MSG passing mode | Rainer Gerhards | 2012-03-19 | 1 | -1/+3 | |
| | | | | ||||||
* | | | | bugfix: memory leak in array passing output module mode | Rainer Gerhards | 2012-03-17 | 1 | -2/+3 | |
| | | | | ||||||
* | | | | bugfix: abort during startup when rsyslog.conf v6+ format was used in a ↵ | Rainer Gerhards | 2012-02-02 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | certain way | |||||
* | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2012-01-27 | 1 | -3/+4 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | |||||
| * | | | 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 | |
| | | | | ||||||
* | | | | refactor: removing dead apc code | Rainer Gerhards | 2012-01-19 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | another concept that did not prove valuable enough to be kept active. For the last couple of releases, the dead code was kept inside the project as we thought we could probably reuse it. Doesn't look so... | |||||
* | | | | refactor: remove very old sync.[ch] system for "abstracting" mutex access | Rainer Gerhards | 2012-01-19 | 1 | -5/+5 | |
| | | | | | | | | | | | | | | | | This was a bad idea that never was used much. |