summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Collapse)AuthorAgeFilesLines
* permitting plugins to use three string requestsRainer Gerhards2012-04-132-4/+8
|
* omelasticsearch: used new property replacer options for default templateRainer Gerhards2012-04-051-1/+1
| | | | makes JSON creation far more bulletproof (and also faster)
* impstats: added $PStatsJSON directiveRainer Gerhards2012-04-012-4/+21
|
* stats module: added capability to format as cee-enhanced syslogBrian Knox2012-04-011-0/+50
|
* ommongodb: now writes a real timestamp into mongoRainer Gerhards2012-03-302-10/+21
|
* added "date-unixtimestamp" property replacer option to format as a unix ↵Rainer Gerhards2012-03-295-2/+133
| | | | timestamp
* action cfg: do no longer require template for TPL_AS_MSG passing modeRainer Gerhards2012-03-191-1/+0
|
* ommongodb: honor db and collection config parametersRainer Gerhards2012-03-171-0/+1
|
* Merge branch 'v6-stable'Rainer Gerhards2012-03-174-38/+60
|\ | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/queue.c runtime/queue.h
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-144-38/+60
| |\
| | * changed statsobj interface and added better docRainer Gerhards2012-03-144-38/+60
| | |
* | | added "json" property replacer optionRainer Gerhards2012-03-161-2/+110
| | |
* | | added message property parsesuccess to indicate status of higher level ↵Rainer Gerhards2012-03-153-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | parser run added message property parsesuccess to indicate if the last run higher-level parser could successfully parse the message or not (see property replacer html doc for details)
* | | Merge branch 'v6-stable'Rainer Gerhards2012-03-123-1/+11
|\| | | | | | | | | | | | | | Conflicts: runtime/queue.c
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-123-2/+11
| |\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * bugfix: stopped DA queue was never processed after a restartRainer Gerhards2012-03-123-2/+11
| | | | | | | | | | | | ...due to a regression from statistics module.
* | | changes needed for libee 0.4.2Rainer Gerhards2012-02-281-1/+1
| | |
* | | bugfix: property $!all-json made rsyslog abort if no normalized data is ↵Rainer Gerhards2012-02-211-4/+11
| | | | | | | | | | | | available
* | | dns cache: working on invalid resolution bug, againRainer Gerhards2012-02-093-4/+7
| | | | | | | | | | | | the proposed solution did not work out well...
* | | dns cache: experimental fix for name resulution problemRainer Gerhards2012-02-081-1/+1
| | |
* | | dns chache: added some more error instrumentationRainer Gerhards2012-02-062-31/+28
| | |
* | | cleanup: remove code for no-longer needed legacy conf functionalityRainer Gerhards2012-02-011-1/+1
| | |
* | | conf file: bufgix: legacy parsing of some filters did not work correctlyRainer Gerhards2012-02-011-1/+1
| | |
* | | bugfix: rsyslog aborted during startup if there is an error in loading an actionRainer Gerhards2012-01-273-24/+18
| | | | | | | | | | | | and legacy configuration mode is used
* | | Merge branch 'v6-stable'Rainer Gerhards2012-01-272-16/+15
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imklog/imklog.c plugins/imklog/imklog.h runtime/conf.c runtime/rsyslog.h
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-273-17/+19
| |\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/omprog/omprog.c runtime/rsyslog.h
| | * Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-273-16/+19
| | |\
| | | * bugfix: omprog made rsyslog abort on startup if not binary to execute was ↵Rainer Gerhards2012-01-271-0/+1
| | | | | | | | | | | | | | | | configured
| | | * relicense unlimited_select.h under ASL 2.0Rainer Gerhards2012-01-261-15/+14
| | | | | | | | | | | | | | | | | | | | after receiving permission from Red Hat legal (given in email from Tomas Heinrich)
| | | * increased max config file line size to 64kRainer Gerhards2012-01-241-1/+4
| | | | | | | | | | | | | | | | | | | | We now also emit an error message if even 64k is not enough (not doing so previously may rightfully be considered as a bug)
* | | | refactor: removing dead apc codeRainer Gerhards2012-01-195-465/+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-193-105/+0
| | | | | | | | | | | | | | | | This was a bad idea that never was used much.
* | | | refactor: removing v6.1 scoping codeRainer Gerhards2012-01-192-140/+12
| | | |
* | | | v6.1/2 scoping support removed from pluginsRainer Gerhards2012-01-191-34/+3
| | | |
* | | | Merge branch 'v6-stable'Rainer Gerhards2012-01-194-16/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/conf.c runtime/modules.c runtime/modules.h
| * | | removing the newScope/resumeScope macro interfacesRainer Gerhards2012-01-194-16/+4
| | | | | | | | | | | | | | | | to make using pre-v6-plugins even easier
* | | | Merge branch 'v6-stable-noscoping' into masterRainer Gerhards2012-01-198-85/+76
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-187-37/+28
| | | | | | | | | | | | | | | | The most common files are now changed, more needs to be done.
| * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-1867-1036/+912
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imptcp/imptcp.c
* | | | Merge branch 'v5-devel' into masterRainer Gerhards2012-01-182-1/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-newstats' into v5-develRainer Gerhards2012-01-1667-1036/+912
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imtcp/imtcp.c
| | * \ \ \ Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-1667-1036/+912
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | Conflicts: plugins/impstats/impstats.c
| | * | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-091-5/+5
| | |\ \ \ \
| * | | | | | part of merge, but forgot to add to merge setRainer Gerhards2012-01-101-0/+3
| | | | | | |
| * | | | | | Merge branch 'v4-stable-tmp' into v5-devel-tmpRainer Gerhards2012-01-101-1/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dirty.h tools/syslogd.c
| | * \ \ \ \ \ Merge branch 'tmp' into v4-stable-tmpRainer Gerhards2012-01-101-1/+5
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dirty.h doc/rsyslog_conf_global.html tools/syslogd.c
| | | * | | | | | added $SpaceLFOnReceive config directiveTomas Heinrich2012-01-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2012-01-091-5/+5
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
* | | | | | | | | Merge branch 'v5-stable' into masterRainer Gerhards2012-01-1853-812/+716
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.h configure.ac doc/manual.html plugins/immark/immark.c plugins/impstats/impstats.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c runtime/cfsysline.c runtime/cfsysline.h runtime/conf.c runtime/ctok.c runtime/ctok.h runtime/ctok_token.c runtime/ctok_token.h runtime/dnscache.h runtime/expr.c runtime/expr.h runtime/rule.c runtime/rule.h runtime/ruleset.h runtime/sysvar.c runtime/vm.h runtime/vmop.c runtime/vmop.h runtime/vmprg.c runtime/vmprg.h runtime/vmstk.c runtime/vmstk.h tools/omusrmsg.c
| * | | | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-1665-1001/+882
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/debug.h runtime/obj.c runtime/parser.h runtime/wti.h