summaryrefslogtreecommitdiffstats
path: root/action.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v6-stable-noscoping' into masterRainer Gerhards2012-01-191-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 IRainer Gerhards2012-01-181-31/+31
| | | | | | | | The most common files are now changed, more needs to be done.
* | Merge branch 'v5-devel' into masterRainer Gerhards2012-01-181-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-tmpRainer Gerhards2012-01-171-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tools/syslogd.c
| | * | add JSON escaping optionNathan Scott2012-01-171-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 Gerhards2011-12-191-7/+58
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c
| * | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-191-3/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| | * | | better performance for action stats & cleanup: removing debug printsRainer Gerhards2011-12-191-3/+6
| | | | |
| * | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-191-0/+5
| |\| | |
| | * | | additional counter for lost messages due to failed actions addedRainer Gerhards2011-12-191-0/+5
| | | | |
| * | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-191-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c
| | * | | added instrumentationRainer Gerhards2011-12-191-3/+45
| | |/ /
| * | | fixing memory leak in new stats code (delete statsobj)Rainer Gerhards2011-12-161-0/+6
| | | |
| * | | experimental: added first stats counter to action objectRainer Gerhards2011-12-161-6/+43
| | | |
| * | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-10-171-10/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2011-08-311-25/+23
| |\ \ \ \
| * \ \ \ \ Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-181-2/+15
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
* | \ \ \ \ \ Merge branch 'beta'Rainer Gerhards2011-12-121-1/+1
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-12-011-1/+1
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-12-011-1/+1
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | Conflicts: action.c
| | | * | | | Merge branch 'v3-stable' into v4-stableRainer Gerhards2011-12-011-1/+1
| | | |\ \ \ \
| | | | * | | | bugfix: action resume interval incorrectly handled, thus took longer to resumev3-stableTomas Heinrich2011-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | | | | | Merge branch 'beta'Rainer Gerhards2011-10-171-10/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-171-10/+9
| |\| | | | | |
| | * | | | | | Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stableRainer Gerhards2011-10-171-1/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | * | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-131-1/+0
| | | |\| | | | | | | | | |_|_|_|/ | | | |/| | | |
| | | | * | | | bugfix: $ActionExecOnlyOnce interval did not work properlyTomas Heinrich2011-10-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * | | | | | bugfix: ActionQueue could malfunction due to index errorVlad Grigorescu2011-10-171-9/+9
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | | | | added support for v6 config system to omfwdRainer Gerhards2011-10-111-1/+6
| | | | | | |
* | | | | | | Merge branch 'beta'Rainer Gerhards2011-08-311-24/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: action.c
| * | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-08-311-25/+23
| |\| | | | |
| | * | | | | bugfix: mark message processing did not work correctlyRainer Gerhards2011-08-311-25/+23
| | | |_|_|/ | | |/| | |
* | | | | | Merge branch 'beta'Andre Lorbach2011-08-181-2/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/queue.c
| * | | | | Merge branch 'v5-stable' into betaAndre Lorbach2011-08-181-2/+15
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| | * | | | removed debug code from action.c and runtime/queue.c after testingAndre Lorbach2011-08-181-17/+0
| | | | | |
| | * | | | bugfix: fixed incorrect state handling for Discard Action (transactions)Andre Lorbach2011-08-181-2/+32
| | | | | |
* | | | | | milestone: queue-params are properly initialized for action queuesRainer Gerhards2011-08-011-14/+15
| | | | | |
* | | | | | milestone: generic action parameters parsed via new config systemRainer Gerhards2011-08-011-27/+87
| | | | | |
* | | | | | milestone: queue object now has a param handler for new conf interfaceRainer Gerhards2011-07-221-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 systemRainer Gerhards2011-07-211-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | but not all syntax handlers are present (so it does not yet fully work).
* | | | | | fixing minor memory leaksRainer Gerhards2011-07-211-0/+1
| | | | | |
* | | | | | milestone: new output plugin interface call addedRainer Gerhards2011-07-211-1/+5
| | | | | |
* | | | | | milestone: done plumbing to call plugin create action instance entry pointRainer Gerhards2011-07-201-0/+100
| | | | | |
* | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-06-271-1/+6
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/imklog.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c plugins/imuxsock/imuxsock.c plugins/mmsnmptrapd/mmsnmptrapd.c tools/omfile.c
| * | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-06-211-8/+12
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-06-161-47/+125
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h
| * | | | | | preparing for 5.9.0v5.9.0Rainer Gerhards2011-06-101-1/+1
| | | | | | |
| * | | | | | set queue name to aciton name (useful for impstats!)Rainer Gerhards2011-06-071-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | so far untested, test follows
* | | | | | | Merge branch 'beta'Rainer Gerhards2011-06-211-47/+129
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/Makefile.am tests/manytcp-too-few-tls.sh
| * | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-06-211-47/+129
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh tests/sndrcv_drvr.sh
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-15 07:10:11 +0000