diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-15 13:58:10 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-15 13:58:10 +0200 |
| commit | 766e3e93d86d0284b135ee37f57d5af9dd25e298 (patch) | |
| tree | 883cab507eecc94d820308332e64a88aadf35d20 /runtime | |
| parent | 60a7a0d4d0d592ef6e372edc919ef62e13ee062e (diff) | |
| download | rsyslog-766e3e93d86d0284b135ee37f57d5af9dd25e298.tar.gz rsyslog-766e3e93d86d0284b135ee37f57d5af9dd25e298.tar.xz rsyslog-766e3e93d86d0284b135ee37f57d5af9dd25e298.zip | |
some mild restart-type HUP cleanup
... only those things that were obvious (and puzzled people looking at
the code without konwing the subtle issues of HUP ;)).
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/conf.c | 18 | ||||
| -rw-r--r-- | runtime/conf.h | 6 |
2 files changed, 5 insertions, 19 deletions
diff --git a/runtime/conf.c b/runtime/conf.c index 84178fd5..2e37edf2 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -93,7 +93,7 @@ DEFobjCurrIf(net) DEFobjCurrIf(rule) DEFobjCurrIf(ruleset) -static int iNbrActions; /* number of actions the running config has. Needs to be init on ReInitConf() */ +static int iNbrActions = 0; /* number of currently defined actions */ /* The following global variables are used for building * tag and host selector lines during startup and config reload. @@ -1204,21 +1204,6 @@ cfline(uchar *line, rule_t **pfCurr) } -/* Reinitialize the configuration subsystem. This is a "work-around" to the fact - * that we do not yet have actual config objects. This method is to be called - * whenever a totally new config is started (which means on startup and HUP). - * Note that it MUST NOT be called for an included config file. - * rgerhards, 2008-07-28 - */ -static rsRetVal -ReInitConf(void) -{ - DEFiRet; - iNbrActions = 0; /* this is what we created the function for ;) - action count is reset */ - RETiRet; -} - - /* return the current number of active actions * rgerhards, 2008-07-28 */ @@ -1252,7 +1237,6 @@ CODESTARTobjQueryInterface(conf) pIf->doIncludeLine = doIncludeLine; pIf->cfline = cfline; pIf->processConfFile = processConfFile; - pIf->ReInitConf = ReInitConf; pIf->GetNbrActActions = GetNbrActActions; finalize_it: diff --git a/runtime/conf.h b/runtime/conf.h index 25b887be..6db1623e 100644 --- a/runtime/conf.h +++ b/runtime/conf.h @@ -37,10 +37,12 @@ BEGINinterface(conf) /* name must also be changed in ENDinterface macro! */ rsRetVal (*doIncludeLine)(uchar **pp, __attribute__((unused)) void* pVal); rsRetVal (*cfline)(uchar *line, rule_t **pfCurr); rsRetVal (*processConfFile)(uchar *pConfFile); - rsRetVal (*ReInitConf)(void); rsRetVal (*GetNbrActActions)(int *); ENDinterface(conf) -#define confCURR_IF_VERSION 2 /* increment whenever you change the interface structure! */ +#define confCURR_IF_VERSION 3 /* increment whenever you change the interface structure! */ +/* in Version 3, entry point "ReInitConf()" was removed, as we do not longer need + * to support restart-type HUP -- rgerhards, 2009-07-15 + */ /* prototypes */ |