summaryrefslogtreecommitdiffstats
path: root/action.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v5-devel'Rainer Gerhards2012-01-271-3/+4
|\
| * Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-01-271-3/+4
| |\
| | * bugfix: action stats did invalidly contain already-discarded messagesRainer Gerhards2012-01-271-3/+4
* | | refactor: removing dead apc codeRainer Gerhards2012-01-191-1/+0
* | | refactor: remove very old sync.[ch] system for "abstracting" mutex accessRainer Gerhards2012-01-191-5/+5
* | | Merge branch 'v6-stable-noscoping' into masterRainer Gerhards2012-01-191-31/+31
|\ \ \
| * | | undoing v6.1 config scoping interface, part IRainer Gerhards2012-01-181-31/+31
* | | | Merge branch 'v5-devel' into masterRainer Gerhards2012-01-181-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'v5-stable-elasticsearch' into v5-devel-tmpRainer Gerhards2012-01-171-1/+1
| |\ \ \
| | * | | add JSON escaping optionNathan Scott2012-01-171-1/+1
* | | | | Merge branch 'v5-devel'Rainer Gerhards2011-12-191-7/+58
|\| | | |
| * | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-191-3/+6
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | 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
| |\| | |
| | * | | 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
| |\ \ \
| * \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2011-08-311-25/+23
| |\ \ \ \
| * \ \ \ \ Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-181-2/+15
| |\ \ \ \ \
* | \ \ \ \ \ 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
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Merge branch 'v3-stable' into v4-stableRainer Gerhards2011-12-011-1/+1
| | | |\ \ \ \
| | | | * | | | bugfix: action resume interval incorrectly handled, thus took longer to resumeTomas Heinrich2011-12-011-1/+1
* | | | | | | | Merge branch 'beta'Rainer Gerhards2011-10-171-10/+9
|\| | | | | | |
| * | | | | | | 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
| | |\ \ \ \ \ \
| | | * | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-131-1/+0
| | | |\| | | | | | | | | |_|_|_|/ | | | |/| | | |
| | | | * | | | bugfix: $ActionExecOnlyOnce interval did not work properlyTomas Heinrich2011-10-131-1/+0
| | * | | | | | bugfix: ActionQueue could malfunction due to index errorVlad Grigorescu2011-10-171-9/+9
| | |/ / / / /
* | | | | | | added support for v6 config system to omfwdRainer Gerhards2011-10-111-1/+6
* | | | | | | Merge branch 'beta'Rainer Gerhards2011-08-311-24/+22
|\| | | | | |
| * | | | | | 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
|\| | | | |
| * | | | | Merge branch 'v5-stable' into betaAndre Lorbach2011-08-181-2/+15
| |\| | | |
| | * | | | 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
* | | | | | milestone: omfile basically gets its parameters via the new systemRainer Gerhards2011-07-211-3/+20
* | | | | | 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
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-06-211-8/+12
| |\ \ \ \ \ | | | |/ / / | | |/| | |