diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-10 16:49:14 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-10 16:49:14 +0200 |
commit | 6f4e3c4e4c85acdcf58969970484a54639ecc8f9 (patch) | |
tree | 1e3470e4ac9738c7713f1ef1a0558ed881457d44 /runtime/rsyslog.c | |
parent | 9704f129f72ec9ece11aeccea4bbf0cbccb116cb (diff) | |
download | rsyslog-6f4e3c4e4c85acdcf58969970484a54639ecc8f9.tar.gz rsyslog-6f4e3c4e4c85acdcf58969970484a54639ecc8f9.tar.xz rsyslog-6f4e3c4e4c85acdcf58969970484a54639ecc8f9.zip |
restructered code in perparation for multiple rule set support
... 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.
Diffstat (limited to 'runtime/rsyslog.c')
-rw-r--r-- | runtime/rsyslog.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/runtime/rsyslog.c b/runtime/rsyslog.c index 81550f12..3496bb0d 100644 --- a/runtime/rsyslog.c +++ b/runtime/rsyslog.c @@ -77,6 +77,8 @@ #include "conf.h" #include "glbl.h" #include "errmsg.h" +#include "rule.h" +#include "ruleset.h" /* forward definitions */ static rsRetVal dfltErrLogger(int, uchar *errMsg); @@ -172,6 +174,10 @@ rsrtInit(char **ppErrObj, obj_if_t *pObjIF) CHKiRet(ctokClassInit(NULL)); if(ppErrObj != NULL) *ppErrObj = "expr"; CHKiRet(exprClassInit(NULL)); + if(ppErrObj != NULL) *ppErrObj = "rule"; + CHKiRet(ruleClassInit(NULL)); + if(ppErrObj != NULL) *ppErrObj = "ruleset"; + CHKiRet(rulesetClassInit(NULL)); if(ppErrObj != NULL) *ppErrObj = "conf"; CHKiRet(confClassInit(NULL)); @@ -204,6 +210,8 @@ rsrtExit(void) /* do actual de-init only if we are the last runtime user */ confClassExit(); glblClassExit(); + rulesetClassExit(); + ruleClassExit(); objClassExit(); /* *THIS* *MUST/SHOULD?* always be the first class initilizer being called (except debug)! */ } |