summaryrefslogtreecommitdiffstats
path: root/action.c
Commit message (Collapse)AuthorAgeFilesLines
* Implement ACT_FIELDS_PASSING, test in mongodbMiloslav Trmač2012-08-281-3/+21
| | | | | | | | | | | | | | The mongodb test contains only debug printfs. Example template, inspired by writeMongoDB_msg: $template MongoTemplate,"%hostname::::sys%%timereported::::time%%timegenerated::::time_rcvd%%msg%%syslogfacility-text::::syslog_fac%%syslogseverity-text::::syslog_server%%syslogtag::::syslog_tag%%programname::::procid%%procid::::pid%%$!foo::::foo%%$!abc::::renamed%" Note that JSON escaping is actually undesirable in this mode (should it be silently ignored?), $!all-json doesn't yet work as expected, and all data is stored as strings. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* Add OMSR_TPL_AS_FIELDS mode for output modules.Miloslav Trmač2012-08-281-0/+6
| | | | | | This does not yet do anything. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* Merge branch 'v6-stable'Rainer Gerhards2012-08-251-8/+8
|\ | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac runtime/ruleset.c tools/syslogd.c
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-08-251-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/RSFALSERainer Gerhards2012-08-221-7/+7
| | | | | | | | | | | | This is done to prevent name claches with libraries.
| | * Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-111-1/+1
| | |\ | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | * bugfix: "last message repeated n times" message was missing hostnameRainer Gerhards2012-06-111-1/+1
| | | | | | | | | | | | | | | | Thanks to Zdenek Salvet for finding this bug and to Bodik for reporting
* | | | Merge branch 'beta'Rainer Gerhards2012-07-241-3/+1
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| * | | debug log: emit (some) action queue parameters to debug logRainer Gerhards2012-07-051-3/+1
| | | |
* | | | Merge branch 'beta'Rainer Gerhards2012-06-291-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h
| * | | Merge branch 'master-elasticsearch' into tmpRainer Gerhards2012-06-291-1/+2
| |\ \ \
| | * | | omelasticsearch: added transactional interface & better debug outputRainer Gerhards2012-05-241-1/+2
| | | | |
* | | | | Merge branch 'beta'Rainer Gerhards2012-06-271-32/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| * | | | cleanup: remove config scoping system left-overRainer Gerhards2012-06-271-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 honoredRainer Gerhards2012-06-271-4/+0
| | | | | | | | | | | | | | | | | | | | Thanks to Abby Edwards for alerting us.
* | | | | change action queue default enqueue timeout from 2000ms to 50msRainer Gerhards2012-06-011-1/+1
|/ / / /
* | | | Merge branch 'v5-beta' into betaRainer Gerhards2012-06-011-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-011-1/+1
| |\| | | | | | | | | | | | | Conflicts: runtime/queue.c
| | * bugfix: delayble source could block action queue, ...Rainer Gerhards2012-06-011-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-develRainer Gerhards2012-04-071-2/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html
| | * | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-071-2/+3
| | |\| | | | | | | | | | | | | | | | | Conflicts: configure.ac
| | | * bugfix: memory leak in array passing output module modeRainer Gerhards2012-03-171-2/+3
| | | |
| * | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-121-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 setRainer Gerhards2012-02-221-3/+5
| | | |
| | * | added configuration directives to customize queue light delay marksRainer Gerhards2012-02-211-0/+4
| | | | | | | | | | | | | | | | | | | | $MainMsgQueueLightDelayMark, $ActionQueueLightDelayMark; both specify number of messages starting at which a delay happens.
| | * | stats: generate friendly name for action queues, if possibleRainer Gerhards2012-01-311-2/+7
| | | |
* | | | action cfg: do no longer require template for TPL_AS_MSG passing modeRainer Gerhards2012-03-191-1/+3
| | | |
* | | | bugfix: memory leak in array passing output module modeRainer Gerhards2012-03-171-2/+3
| | | |
* | | | bugfix: abort during startup when rsyslog.conf v6+ format was used in a ↵Rainer Gerhards2012-02-021-2/+2
| | | | | | | | | | | | | | | | certain way
* | | | Merge branch 'v5-devel'Rainer Gerhards2012-01-271-3/+4
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| * | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-01-271-3/+4
| |\| | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| | * | bugfix: action stats did invalidly contain already-discarded messagesRainer Gerhards2012-01-271-3/+4
| | | |
* | | | refactor: removing dead apc codeRainer Gerhards2012-01-191-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 accessRainer Gerhards2012-01-191-5/+5
| | | | | | | | | | | | | | | | This was a bad idea that never was used much.
* | | | 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
| |\ \ \ \
generated by cgit (git 2.34.1) at 2024-04-20 01:30:28 +0000