summaryrefslogtreecommitdiffstats
path: root/runtime/conf.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'beta'Rainer Gerhards2012-01-091-0/+5
|\ | | | | | | | | | | Conflicts: ChangeLog doc/v6compatibility.html
| * removing $Begin, $End, $StrictScoping directivesRainer Gerhards2012-01-091-0/+5
| | | | | | | | | | | | v6.4 will provide the same functionality in a far better way. So we do not want to clutter the code. -------------------------
| * Merge branch 'v5-stable' into betaRainer Gerhards2011-10-211-1/+1
| |\ | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
* | \ Merge branch 'v5-devel'Rainer Gerhards2011-10-211-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2011-10-211-1/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
| | * | bugfix: missing whitespace after property-based filter was not detectedRainer Gerhards2011-10-211-1/+1
| | | |
* | | | Merge branch 'v5-devel'Rainer Gerhards2011-09-261-0/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/conf.c tools/omfile.c tools/omusrmsg.c
| * | | added capability to emit config error location info for warningsRainer Gerhards2011-08-091-5/+26
| | | | | | | | | | | | | | | | | | | | otherwise, omusrmsg's warning about new config format was not accompanied by problem location.
* | | | milestone: generic action parameters parsed via new config systemRainer Gerhards2011-08-011-1/+2
| | | |
* | | | milestone: queue object now has a param handler for new conf interfaceRainer Gerhards2011-07-221-1/+1
| | | | | | | | | | | | | | | | ... and action queue defs use this new interface (but not yet the main queues)
* | | | milestone: done plumbing to call plugin create action instance entry pointRainer Gerhards2011-07-201-40/+0
| | | |
* | | | milestone: added module config namesRainer Gerhards2011-07-201-81/+0
| | | |
* | | | Merge branch 'master-newconf'Rainer Gerhards2011-07-121-365/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tools/omfile.c
| * | | | more cleanup, working on emergency config systemRainer Gerhards2011-07-111-2/+5
| | | | |
| * | | | more cleanupRainer Gerhards2011-07-111-8/+0
| | | | |
| * | | | cleanup, removing now unused codeRainer Gerhards2011-07-111-83/+0
| | | | |
| * | | | cleaup & emergency config system reactivatedRainer Gerhards2011-07-091-257/+0
| | | | |
| * | | | milestone/[PARTWORK]: integrted script filter, but var access is missingRainer Gerhards2011-07-071-3/+7
| | | | |
| * | | | milestone:/[PARTWORK]: config is processed using new parser, except...Rainer Gerhards2011-07-061-16/+15
| | | | | | | | | | | | | | | | | | | | ... for "if" filters (more work to come, probably lots of more work... ;))
* | | | | Merge branch 'v5-devel'Rainer Gerhards2011-07-111-12/+5
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
| * / / cosmetic: reformatted some codeRainer Gerhards2011-06-301-12/+5
| |/ / | | | | | | | | | so that more fits on a single screen --> useful for analysis
* | | step: put plumbing in place for new input module config systemRainer Gerhards2011-05-031-16/+18
| | |
* | | step: config-specific module list used during config processingRainer Gerhards2011-04-271-4/+4
| | |
* | | step: added config-specific module listRainer Gerhards2011-04-271-1/+1
| | |
* | | step: $ModLoad handler no longe requries conf objRainer Gerhards2011-04-271-3/+2
| | | | | | | | | | | | | | | re-doing the interface, global var "loadConf" now holds that data. Makes things simpler with legacy handler, as well as new functionality.
* | | step: config handler setting from syslogd.c moved to rsconf.cRainer Gerhards2011-04-211-3/+3
| | |
* | | some more work was required on the ruleset modificationRainer Gerhards2011-04-191-1/+1
| | |
* | | milestone: ruleset now supports rsconf_tRainer Gerhards2011-04-191-8/+7
| | |
* | | milestone: conf obj interface now utilzes rsconf_tRainer Gerhards2011-04-191-22/+22
| | |
* | | milestone: templates are now in config objectRainer Gerhards2011-04-191-1/+1
| | |
* | | renaming conf.* wasn't a good idea -- undoingRainer Gerhards2011-04-191-0/+1453
| | | | | | | | | | | | | | | too many dependencies, things get cluttered (and merging probably gets problematic). Now new config will be "conf2".
* | | renamed conf.c to legacyconf.c to make room for new config systemRainer Gerhards2011-04-191-1453/+0
| |/ |/|
* | Merge branch 'v5-devel'Rainer Gerhards2010-12-171-1/+6
|\| | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c runtime/glbl.c
| * bugfix: unitialized variable could cause issues under extreme conditionsRainer Gerhards2010-12-161-1/+6
| | | | | | | | | | | | plus some minor nits. This was found after a clang static code analyzer analysis (great tool, and special thanks to Marcin for telling me about it!)
* | milestone: added support for CEE-properties in property-based filtersRainer Gerhards2010-12-011-7/+20
| |
* | Merge branch 'master' into newconfRainer Gerhards2010-08-051-1/+1
|\| | | | | | | | | Conflicts: doc/manual.html
| * Merge branch 'v4-devel' into masterRainer Gerhards2010-08-051-1/+1
| |\ | | | | | | | | | | | | Conflicts: ChangeLog
| | * Merge branch 'v3-stable' into v4-stableRainer Gerhards2010-08-051-1/+1
| | |\ | | | | | | | | | | | | | | | | Conflicts: runtime/conf.c
| | | * program name filter ! in the configuration cannot be resetKiss Gabor (Bitman)2010-08-051-2/+1
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | final (?) milestone: looks like action scoping works nowRainer Gerhards2010-07-271-1/+34
| | | | | | | | | | | | | | | | but doc and testing is missing!
* | | | added support to save/restore rsyslog core action settings...Rainer Gerhards2010-07-231-1/+19
| | | | | | | | | | | | | | | | | | | | ... but not those of plugins (which are at least as important as the core ones). So this is an interim commit.
* | | | first shot at scoping (for actions only)Rainer Gerhards2010-07-231-1/+93
|/ / / | | | | | | | | | | | | parser now supports $Begin action, $End action, $StrictScoping, but not yet the actual semantics.
* | | Merge branch 'v4-beta' into betaRainer Gerhards2010-02-041-3/+5
|\| |
| * | Merge branch 'v4-stable' into v4-betaRainer Gerhards2010-02-041-3/+5
| |\ \
| | * | bugfix: several smaller bugs resolved after flexelint reviewvarmojfekoj2010-02-041-3/+5
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | Merge branch 'v4-beta' into betaRainer Gerhards2010-01-261-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/queue.c
| * | | bugfix: blanks inside file names did not terminate file name parsing.Rainer Gerhards2010-01-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | This could reslult in the whole rest of a line (including comments) to be treated as file name in "write to file" actions. Thanks to Jack for reporting this issue.
* | | | bugfix: first UDP listener was incorrectly assigned its rulesetRainer Gerhards2009-10-191-1/+2
| | | | | | | | | | | | | | | | | | | | this was a regression of the recent imudp multi-ruleset enhancement bug was not in any released version
* | | | cleanup: finally moved some config variables just to conf.cRainer Gerhards2009-10-191-7/+15
| | | |
* | | | some mild restart-type HUP cleanupRainer Gerhards2009-07-151-17/+1
| | | | | | | | | | | | | | | | | | | | ... only those things that were obvious (and puzzled people looking at the code without konwing the subtle issues of HUP ;)).