summaryrefslogtreecommitdiffstats
path: root/runtime/conf.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-stable' into masterRainer Gerhards2012-01-181-15/+14
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-141-15/+14
| |\
| | * license changeRainer Gerhards2012-01-141-15/+14
| | | | | | | | | | | | after careful consideration of affected code
* | | more cleanup, working on emergency config systemRainer Gerhards2011-07-111-1/+0
| | |
* | | cleaup & emergency config system reactivatedRainer Gerhards2011-07-091-2/+0
| | |
* | | milestone/[PARTWORK]: integrted script filter, but var access is missingRainer Gerhards2011-07-071-0/+3
| | |
* | | milestone:/[PARTWORK]: config is processed using new parser, except...Rainer Gerhards2011-07-061-2/+11
| | | | | | | | | | | | ... for "if" filters (more work to come, probably lots of more work... ;))
* | | step: $ModLoad handler no longe requries conf objRainer Gerhards2011-04-271-1/+1
| | | | | | | | | | | | | | | 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-1/+1
| | |
* | | milestone: conf obj interface now utilzes rsconf_tRainer Gerhards2011-04-191-8/+10
| | |
* | | renaming conf.* wasn't a good idea -- undoingRainer Gerhards2011-04-191-0/+65
| | | | | | | | | | | | | | | 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-65/+0
| | |
* | | first shot at scoping (for actions only)Rainer Gerhards2010-07-231-1/+9
|/ / | | | | | | | | parser now supports $Begin action, $End action, $StrictScoping, but not yet the actual semantics.
* | cleanup: finally moved some config variables just to conf.cRainer Gerhards2009-10-191-4/+0
| |
* | some mild restart-type HUP cleanupRainer Gerhards2009-07-151-2/+4
|/ | | | | ... only those things that were obvious (and puzzled people looking at the code without konwing the subtle issues of HUP ;)).
* re-enabled pipe, tty and console in omfileRainer Gerhards2009-06-121-0/+4
| | | | | | | ... by moving code to stream.c. Thanks to the new design, new cases are not really needed, resulting in cleaner code. I also did a cleanup of header file usage as a side-activity.
* restructered code in perparation for multiple rule set supportRainer Gerhards2009-06-101-1/+1
| | | | | | | ... this was long overdue, and I finlly tackeld it. It turned out to be more complex than I initially thought. The next step now probably is to actually implement multiple rule sets and the beauty that comes with them.
* enhanced configuration file error reporting and verificationRainer Gerhards2008-07-291-1/+3
| | | | | | | | | | | | - enhanced config file checking - no active actions are detected - added -N rsyslogd command line option for a config validation run (which does not execute actual syslogd code and does not interfere with a running instance) - somewhat improved emergency configuration. It is now also selected if the config contains no active actions - rsyslogd error messages are now reported to stderr by default. can be turned off by the new "$ErrorMessagesToStderr off" directive Thanks to HKS for suggesting these new features.
* begun building a testbenchRainer Gerhards2008-06-131-0/+53