summaryrefslogtreecommitdiffstats
path: root/runtime/rsconf.c
Commit message (Collapse)AuthorAgeFilesLines
* bugfix: ruleset(){} directive errornously changed default rulesetRainer Gerhards2012-10-011-0/+2
| | | | | much like the $ruleset legacy conf statement. This potentially lead to statements being assigned to the wrong ruleset.
* Implement RainerScript ruleset() statementRainer Gerhards2012-09-281-0/+3
|
* cleanupRainer Gerhards2012-09-281-5/+1
| | | | | recent enhancement in RainerScript param handlers permit to remove now-redundant code
* Merge branch 'v6-devel'Rainer Gerhards2012-09-271-1/+57
|\ | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c grammar/grammar.y runtime/modules.h runtime/rsconf.c
| * Do not load module if it had errorneous parametersRainer Gerhards2012-09-271-1/+4
| |
| * cleanupRainer Gerhards2012-09-261-2/+0
| |
| * cleanupRainer Gerhards2012-09-261-3/+0
| |
| * input stmt: add core engine plumbingRainer Gerhards2012-09-261-0/+58
| |
* | cosmetic: remove no-longer valid TODO itemRainer Gerhards2012-09-251-1/+0
| |
* | cleanup & better debug outputRainer Gerhards2012-09-241-4/+4
| | | | | | | | | | - removed no longer needed function - debug log now contains action type for action objects
* | Add skeleton for RainerScript optimizerRainer Gerhards2012-09-201-0/+1
| | | | | | | | actual optimization is not yet done
* | Merge branch 'v6-devel'Rainer Gerhards2012-09-201-0/+3
|\|
| * Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-201-0/+3
| |\ | | | | | | | | | | | | Conflicts: ChangeLog
| | * Fix missing Sysklogd templateMilan Bartos2012-09-201-0/+3
| | | | | | | | | | | | modified: runtime/rsconf.c
| * | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-061-2/+16
| |\|
| | * bugfix: omusrsmsg incorrect return state & config warning handlingRainer Gerhards2012-08-281-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 blocksRainer Gerhards2012-09-111-2/+10
| | |
* | | new ruleengine: cleanupRainer Gerhards2012-09-071-53/+0
| | |
* | | new ruleengine: some cleanupRainer Gerhards2012-09-061-38/+0
| | |
* | | new ruleengine: PROP and PRI legacy filter structures properly createdRainer Gerhards2012-09-041-3/+2
| | |
* | | new ruleengine: skeleton for reading conf file in placeRainer Gerhards2012-09-041-0/+8
|/ / | | | | | | code still does not work, actual functions not implemented
* | milestone: LIST-type templates work, but no all options yet presentRainer Gerhards2012-08-251-5/+6
| |
* | milestone: base plumbing for LIST-type templates mostly in placeRainer Gerhards2012-08-251-0/+1
| |
* | v6 config/templates: legacy types are now supported via template()Rainer Gerhards2012-08-251-2/+2
| |
* | add base plumbing for template() config object to grammarRainer Gerhards2012-08-241-0/+10
| |
* | Merge branch 'beta'Rainer Gerhards2012-06-291-1/+1
|\| | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h
| * Merge branch 'master-elasticsearch' into tmpRainer Gerhards2012-06-291-1/+1
| |\
| | * omelasticsearch: used new property replacer options for default templateRainer Gerhards2012-04-051-1/+1
| | | | | | | | | | | | makes JSON creation far more bulletproof (and also faster)
* | | cleanup & fix of mini-leakRainer Gerhards2012-06-251-2/+0
| | |
* | | implemented freeCnf() module interface & fixed some mem leaksRainer Gerhards2012-06-251-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 worksRainer Gerhards2012-06-211-11/+11
| | | | | | | | | | | | some nits to iron out, only omfile actually support module params
* | | milestone: module() can load module in legacy modeRainer Gerhards2012-06-201-0/+3
| | |
* | | Merge branch 'beta'Rainer Gerhards2012-06-061-0/+1
|\| |
| * | fixing small memleak during config read phaseRainer Gerhards2012-06-051-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 terminationRainer Gerhards2012-05-311-1/+2
|/ / | | | | | | (but now requires at least librelp 1.0.1)
* / better debug instrumentation --> input thread names used for reportingRainer Gerhards2012-05-021-1/+2
|/
* bugfix: rsyslog aborted during startup if there is an error in loading an actionRainer Gerhards2012-01-271-18/+16
| | | | and legacy configuration mode is used
* Merge branch 'v6-stable-noscoping' into masterRainer Gerhards2012-01-191-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 masterRainer Gerhards2012-01-181-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 interfaceRainer Gerhards2011-07-221-1/+5
| | | | ... and action queue defs use this new interface (but not yet the main queues)
* milestone: all syntaxes for new config handler implementedRainer Gerhards2011-07-221-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 Gerhards2011-07-211-2/+6
|
* milestone: omfile basically gets its parameters via the new systemRainer Gerhards2011-07-211-0/+1
| | | | | but not all syntax handlers are present (so it does not yet fully work).
* fixing minor memory leaksRainer Gerhards2011-07-211-5/+5
|
* milestone: done plumbing to call plugin create action instance entry pointRainer Gerhards2011-07-201-1/+5
|
* milestone: size syntax implementedRainer Gerhards2011-07-191-9/+0
|
* milestone: glbl obj parameters settable via new conf interfaceRainer Gerhards2011-07-191-3/+16
|
* milestone: first steps at global() conf obj implementationRainer Gerhards2011-07-191-0/+5
| | | | | also, the foundation for accessing conf file params has been laid. Still more work to do...
* bugfix: misaddressing in config handlerRainer Gerhards2011-07-151-1/+1
| | | | | In theory, can cause segfault, in practice this is extremely unlikely Thanks to Marcin for alertig me.
* more cleanupRainer Gerhards2011-07-151-3/+3
|