diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-27 14:02:00 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-27 14:02:00 +0200 |
commit | 17e3f6b49cccb99316f2907eb3c131ec998ee3c3 (patch) | |
tree | 5b8ed0a9bd0fc09e9c9e766d961d6fb4eb203395 /runtime/rsconf.c | |
parent | 706121052d2c2c0bca42b3f8f1e785dd96369772 (diff) | |
download | rsyslog-17e3f6b49cccb99316f2907eb3c131ec998ee3c3.tar.gz rsyslog-17e3f6b49cccb99316f2907eb3c131ec998ee3c3.tar.xz rsyslog-17e3f6b49cccb99316f2907eb3c131ec998ee3c3.zip |
step: $ModLoad handler no longe requries conf obj
re-doing the interface, global var "loadConf" now holds that data. Makes
things simpler with legacy handler, as well as new functionality.
Diffstat (limited to 'runtime/rsconf.c')
-rw-r--r-- | runtime/rsconf.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/runtime/rsconf.c b/runtime/rsconf.c index 2a87756f..a32205d9 100644 --- a/runtime/rsconf.c +++ b/runtime/rsconf.c @@ -380,18 +380,6 @@ finalize_it: * TODO: move to conf.c? */ -/* this method is needed to shuffle the current conf object down to the - * IncludeConfig handler. - */ -static rsRetVal -doModLoad(void *pVal, uchar *pNewVal) -{ - DEFiRet; - iRet = conf.doModLoad(ourConf, pVal, pNewVal); - free(pNewVal); - RETiRet; -} - /* legacy config system: set the action resume interval */ static rsRetVal setActionResumeInterval(void __attribute__((unused)) *pVal, int iNewVal) { @@ -685,8 +673,10 @@ initLegacyConf(void) CHKiRet(regCfSysLineHdlr((uchar *)"actionresumeinterval", 0, eCmdHdlrInt, setActionResumeInterval, NULL, NULL, eConfObjGlobal)); + //CHKiRet(regCfSysLineHdlr((uchar *)"modload", 0, eCmdHdlrCustomHandler, + //doModLoad, NULL, NULL, eConfObjGlobal)); CHKiRet(regCfSysLineHdlr((uchar *)"modload", 0, eCmdHdlrCustomHandler, - doModLoad, NULL, NULL, eConfObjGlobal)); + conf.doModLoad, NULL, NULL, eConfObjGlobal)); CHKiRet(regCfSysLineHdlr((uchar *)"includeconfig", 0, eCmdHdlrCustomHandler, doIncludeLine, NULL, NULL, eConfObjGlobal)); CHKiRet(regCfSysLineHdlr((uchar *)"umask", 0, eCmdHdlrFileCreateMode, |