Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. | ||||
* | | | Merge branch 'v6-stable-noscoping' into master | Rainer Gerhards | 2012-01-19 | 1 | -31/+31 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/imklog.c plugins/immark/immark.c plugins/imptcp/imptcp.c plugins/imrelp/imrelp.c plugins/imtcp/imtcp.c plugins/imtemplate/imtemplate.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c plugins/mmsnmptrapd/mmsnmptrapd.c plugins/omtemplate/omtemplate.c runtime/glbl.c runtime/parser.c tools/omfile.c tools/syslogd.c | ||||
| * | | | 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-devel' into master | Rainer Gerhards | 2012-01-18 | 1 | -1/+1 |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog Makefile.am configure.ac doc/manual.html plugins/imptcp/imptcp.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/parser.c template.c tools/omfwd.c tools/syslogd.c | ||||
| * | | | 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-devel' | Rainer Gerhards | 2011-12-19 | 1 | -7/+58 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c | ||||
| * | | | | 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 |
| | |/ / | |||||
| * | | | 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' into v5-devel | 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 | ||||
* | \ \ \ \ \ | Merge branch 'beta' | Rainer Gerhards | 2011-12-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | 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 'beta' | Rainer Gerhards | 2011-10-17 | 1 | -10/+9 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | | | | | 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> | ||||
* | | | | | | | added support for v6 config system to omfwd | Rainer Gerhards | 2011-10-11 | 1 | -1/+6 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'beta' | Rainer Gerhards | 2011-08-31 | 1 | -24/+22 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: action.c | ||||
| * | | | | | | 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 'beta' | Andre Lorbach | 2011-08-18 | 1 | -2/+15 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/queue.c | ||||
| * | | | | | 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 |
| | | | | | | |||||
* | | | | | | milestone: queue-params are properly initialized for action queues | Rainer Gerhards | 2011-08-01 | 1 | -14/+15 |
| | | | | | | |||||
* | | | | | | milestone: generic action parameters parsed via new config system | Rainer Gerhards | 2011-08-01 | 1 | -27/+87 |
| | | | | | | |||||
* | | | | | | milestone: queue object now has a param handler for new conf interface | Rainer Gerhards | 2011-07-22 | 1 | -51/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | ... and action queue defs use this new interface (but not yet the main queues) | ||||
* | | | | | | milestone: omfile basically gets its parameters via the new system | Rainer Gerhards | 2011-07-21 | 1 | -3/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | but not all syntax handlers are present (so it does not yet fully work). | ||||
* | | | | | | fixing minor memory leaks | Rainer Gerhards | 2011-07-21 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | milestone: new output plugin interface call added | Rainer Gerhards | 2011-07-21 | 1 | -1/+5 |
| | | | | | |