[rsyslog] [PATCH rsyslog-zeromq 2/3] merge with the current master branch

[Christian Brunner]

To compile with the current master branch of rsyslog I had to do some
changes. (2011-05-31)

I'm not sure if everything is correct, but at least it seems to work.

Christian
---
 imzeromq/imzeromq.c |   14 +++++++-------
 omzeromq/omzeromq.c |   15 ++++++++++++++-
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/imzeromq/imzeromq.c b/imzeromq/imzeromq.c
index f275473..b5d9a45 100644
--- a/imzeromq/imzeromq.c
+++ b/imzeromq/imzeromq.c
@@ -80,7 +80,7 @@ set_ruleset(void __attribute__((unused)) *pVal, uchar 
*pszName)
        rsRetVal localRet;
        DEFiRet;
 
-       localRet = ruleset.GetRuleset(&pRuleset, pszName);
+       localRet = ruleset.GetRuleset(ourConf, &pRuleset, pszName);
        if(localRet == RS_RET_NOT_FOUND) {
                errmsg.LogError(0, NO_ERRCODE, "error: "
                         "ruleset '%s' not found - ignored", pszName);
@@ -447,14 +447,14 @@ CODEmodInit_QueryRegCFSLineHdlr
 
        /* register config file handlers */
        CHKiRet(omsdRegCFSLineHdlr((uchar *)"inputzeromqserverbindruleset",
-                               0, eCmdHdlrGetWord,
-               set_ruleset, NULL, STD_LOADABLE_MODULE_ID));
+                0, eCmdHdlrGetWord, set_ruleset, NULL,
+               STD_LOADABLE_MODULE_ID, eConfObjGlobal));
        CHKiRet(omsdRegCFSLineHdlr((uchar *)"inputzeromqserverrun",
-                               0, eCmdHdlrGetWord,
-               add_endpoint, NULL, STD_LOADABLE_MODULE_ID));
+                0, eCmdHdlrGetWord, add_endpoint, NULL,
+               STD_LOADABLE_MODULE_ID, eConfObjGlobal));
        CHKiRet(omsdRegCFSLineHdlr((uchar *)"resetconfigvariables",
-                               1, eCmdHdlrCustomHandler,
-               resetConfigVariables, NULL, STD_LOADABLE_MODULE_ID));
+                1, eCmdHdlrCustomHandler, resetConfigVariables, NULL,
+               STD_LOADABLE_MODULE_ID, eConfObjGlobal));
 ENDmodInit
 /* vim:set ai:
  */
diff --git a/omzeromq/omzeromq.c b/omzeromq/omzeromq.c
index 81f8dca..12501d6 100644
--- a/omzeromq/omzeromq.c
+++ b/omzeromq/omzeromq.c
@@ -48,6 +48,8 @@
 MODULE_TYPE_OUTPUT
 MODULE_TYPE_NOKEEP
 
+static rsRetVal resetConfigVariables(uchar __attribute__((unused)) *pp, void 
__attribute__((unused)) *pVal);
+
 /* internal structures
  */
 DEF_OMOD_STATIC_DATA
@@ -66,6 +68,16 @@ typedef struct _instanceData {
     void *             socket;
 } instanceData;
 
+typedef struct configSettings_s {
+} configSettings_t;
+
+SCOPING_SUPPORT;
+
+BEGINinitConfVars              /* (re)set config variables to default values */
+CODESTARTinitConfVars 
+       resetConfigVariables(NULL, NULL);
+ENDinitConfVars
+
 BEGINcreateInstance
 CODESTARTcreateInstance
 ENDcreateInstance
@@ -326,10 +338,11 @@ static rsRetVal resetConfigVariables(uchar 
__attribute__((unused)) *pp, void __a
 
 BEGINmodInit()
 CODESTARTmodInit
+SCOPINGmodInit
        *ipIFVersProvided = CURR_MOD_IF_VERSION; /* we only support the current 
interface specification */
 CODEmodInit_QueryRegCFSLineHdlr
        CHKiRet(objUse(errmsg, CORE_COMPONENT));
-       CHKiRet(omsdRegCFSLineHdlr((uchar *)"resetconfigvariables", 1, 
eCmdHdlrCustomHandler, resetConfigVariables, NULL, STD_LOADABLE_MODULE_ID));
+       CHKiRet(omsdRegCFSLineHdlr((uchar *)"resetconfigvariables", 1, 
eCmdHdlrCustomHandler, resetConfigVariables, NULL, STD_LOADABLE_MODULE_ID, 
eConfObjAction));
 CODEmodInit_QueryRegCFSLineHdlr
 ENDmodInit
 
-- 
1.7.1

_______________________________________________
rsyslog mailing list
http://lists.adiscon.net/mailman/listinfo/rsyslog
http://www.rsyslog.com