Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix missing functionality: ruleset(){} could not specify ruleset queue | Rainer Gerhards | 2012-11-30 | 1 | -1/+1 |
| | | | | | | | | | | The "queue.xxx" parameter set was not supported, and legacy ruleset config statements did not work (by intention). The fix introduces the "queue.xxx" parameter set. It has some regression potential, but only for the new functionality. Note that using that interface it is possible to specify duplicate queue file names, which will cause trouble. This will be solved in v7.3, because there is a too-large regression potential for the v7.2 stable branch. | ||||
* | silence compiler warnings | Rainer Gerhards | 2012-11-30 | 1 | -0/+6 |
| | | | | | the changes do not affect actual code execution, just keep the compile log clean. | ||||
* | Improve syntax error messages by outputting the error token | Rainer Gerhards | 2012-10-27 | 1 | -1/+2 |
| | |||||
* | bugfix: ruleset(){} directive errornously changed default ruleset | Rainer Gerhards | 2012-10-01 | 1 | -0/+2 |
| | | | | | much like the $ruleset legacy conf statement. This potentially lead to statements being assigned to the wrong ruleset. | ||||
* | Implement RainerScript ruleset() statement | Rainer Gerhards | 2012-09-28 | 1 | -0/+3 |
| | |||||
* | cleanup | Rainer Gerhards | 2012-09-28 | 1 | -5/+1 |
| | | | | | recent enhancement in RainerScript param handlers permit to remove now-redundant code | ||||
* | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-27 | 1 | -1/+57 |
|\ | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c grammar/grammar.y runtime/modules.h runtime/rsconf.c | ||||
| * | Do not load module if it had errorneous parameters | Rainer Gerhards | 2012-09-27 | 1 | -1/+4 |
| | | |||||
| * | cleanup | Rainer Gerhards | 2012-09-26 | 1 | -2/+0 |
| | | |||||
| * | cleanup | Rainer Gerhards | 2012-09-26 | 1 | -3/+0 |
| | | |||||
| * | input stmt: add core engine plumbing | Rainer Gerhards | 2012-09-26 | 1 | -0/+58 |
| | | |||||
* | | cosmetic: remove no-longer valid TODO item | Rainer Gerhards | 2012-09-25 | 1 | -1/+0 |
| | | |||||
* | | cleanup & better debug output | Rainer Gerhards | 2012-09-24 | 1 | -4/+4 |
| | | | | | | | | | | - removed no longer needed function - debug log now contains action type for action objects | ||||
* | | Add skeleton for RainerScript optimizer | Rainer Gerhards | 2012-09-20 | 1 | -0/+1 |
| | | | | | | | | actual optimization is not yet done | ||||
* | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-20 | 1 | -0/+3 |
|\| | |||||
| * | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-20 | 1 | -0/+3 |
| |\ | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | Fix missing Sysklogd template | Milan Bartos | 2012-09-20 | 1 | -0/+3 |
| | | | | | | | | | | | | modified: runtime/rsconf.c | ||||
| * | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-06 | 1 | -2/+16 |
| |\| | |||||
| | * | bugfix: omusrsmsg incorrect return state & config warning handling | Rainer Gerhards | 2012-08-28 | 1 | -2/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During config file processing, Omusrmsg often incorrectly returned a warning status, even when no warning was present (caused by uninitialized variable). Also, the core handled warning messages incorrectly, and treated them as errors. As a result, omusrmsg (most often) could not properly be loaded. Note that this only occurs with legacy config action syntax. This was a regression caused by an incorrect merge in to the 6.3.x codebase. Thanks to Stefano Mason for alerting us of this bug. | ||||
* | | | new ruleengine: properly remove BSD-style blocks | Rainer Gerhards | 2012-09-11 | 1 | -2/+10 |
| | | | |||||
* | | | new ruleengine: cleanup | Rainer Gerhards | 2012-09-07 | 1 | -53/+0 |
| | | | |||||
* | | | new ruleengine: some cleanup | Rainer Gerhards | 2012-09-06 | 1 | -38/+0 |
| | | | |||||
* | | | new ruleengine: PROP and PRI legacy filter structures properly created | Rainer Gerhards | 2012-09-04 | 1 | -3/+2 |
| | | | |||||
* | | | new ruleengine: skeleton for reading conf file in place | Rainer Gerhards | 2012-09-04 | 1 | -0/+8 |
|/ / | | | | | | | code still does not work, actual functions not implemented | ||||
* | | milestone: LIST-type templates work, but no all options yet present | Rainer Gerhards | 2012-08-25 | 1 | -5/+6 |
| | | |||||
* | | milestone: base plumbing for LIST-type templates mostly in place | Rainer Gerhards | 2012-08-25 | 1 | -0/+1 |
| | | |||||
* | | v6 config/templates: legacy types are now supported via template() | Rainer Gerhards | 2012-08-25 | 1 | -2/+2 |
| | | |||||
* | | add base plumbing for template() config object to grammar | Rainer Gerhards | 2012-08-24 | 1 | -0/+10 |
| | | |||||
* | | Merge branch 'beta' | Rainer Gerhards | 2012-06-29 | 1 | -1/+1 |
|\| | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h | ||||
| * | Merge branch 'master-elasticsearch' into tmp | Rainer Gerhards | 2012-06-29 | 1 | -1/+1 |
| |\ | |||||
| | * | omelasticsearch: used new property replacer options for default template | Rainer Gerhards | 2012-04-05 | 1 | -1/+1 |
| | | | | | | | | | | | | makes JSON creation far more bulletproof (and also faster) | ||||
* | | | cleanup & fix of mini-leak | Rainer Gerhards | 2012-06-25 | 1 | -2/+0 |
| | | | |||||
* | | | implemented freeCnf() module interface & fixed some mem leaks | Rainer Gerhards | 2012-06-25 | 1 | -0/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | The interface was actually not present in older versions, even though some modules already used it. The implementation was now done, and not in 6.3/6.4 because the resulting memory leak was ultra-slim and the new interface handling has some potential to seriously break things. Not the kind of thing you want to add in late beta state, if avoidable. | ||||
* | | | milestone: module() config statement basically works | Rainer Gerhards | 2012-06-21 | 1 | -11/+11 |
| | | | | | | | | | | | | some nits to iron out, only omfile actually support module params | ||||
* | | | milestone: module() can load module in legacy mode | Rainer Gerhards | 2012-06-20 | 1 | -0/+3 |
| | | | |||||
* | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-06 | 1 | -0/+1 |
|\| | | |||||
| * | | fixing small memleak during config read phase | Rainer Gerhards | 2012-06-05 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | traditional system line buffers were not freed. semi-static memory leak during config load phase, did not grow while processing messages. Usually less than 5k during the whole runtime. | ||||
* | | | imrelp now supports non-cancel thread termination | Rainer Gerhards | 2012-05-31 | 1 | -1/+2 |
|/ / | | | | | | | (but now requires at least librelp 1.0.1) | ||||
* / | better debug instrumentation --> input thread names used for reporting | Rainer Gerhards | 2012-05-02 | 1 | -1/+2 |
|/ | |||||
* | bugfix: rsyslog aborted during startup if there is an error in loading an action | Rainer Gerhards | 2012-01-27 | 1 | -18/+16 |
| | | | | and legacy configuration mode is used | ||||
* | Merge branch 'v6-stable-noscoping' into master | Rainer Gerhards | 2012-01-19 | 1 | -46/+46 |
| | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | Merge branch 'v5-devel' into master | Rainer Gerhards | 2012-01-18 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | 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 | ||||
* | milestone: queue object now has a param handler for new conf interface | Rainer Gerhards | 2011-07-22 | 1 | -1/+5 |
| | | | | ... and action queue defs use this new interface (but not yet the main queues) | ||||
* | milestone: all syntaxes for new config handler implemented | Rainer Gerhards | 2011-07-22 | 1 | -1/+0 |
| | | | | | | so far, mostly compile-time tested. Real testing happens as side-activity when implementing other parts of the new config system | ||||
* | bugfix: abort in omfile (in brand-new code) | Rainer Gerhards | 2011-07-21 | 1 | -2/+6 |
| | |||||
* | milestone: omfile basically gets its parameters via the new system | Rainer Gerhards | 2011-07-21 | 1 | -0/+1 |
| | | | | | but not all syntax handlers are present (so it does not yet fully work). | ||||
* | fixing minor memory leaks | Rainer Gerhards | 2011-07-21 | 1 | -5/+5 |
| | |||||
* | milestone: done plumbing to call plugin create action instance entry point | Rainer Gerhards | 2011-07-20 | 1 | -1/+5 |
| | |||||
* | milestone: size syntax implemented | Rainer Gerhards | 2011-07-19 | 1 | -9/+0 |
| | |||||
* | milestone: glbl obj parameters settable via new conf interface | Rainer Gerhards | 2011-07-19 | 1 | -3/+16 |
| |