diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-13 13:15:15 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-13 13:15:15 +0100 |
commit | dc760e8c672c2c896bc0d001fa1f7d9e02fe111c (patch) | |
tree | 89609f09d667ab7db2f60139eb59524458a57f60 /plugins/mmfields/mmfields.c | |
parent | 23278699e35173f46effda964fd80b8f868e8b3e (diff) | |
parent | 45a4134a8b5c9111398be3458bd27b4aa2f0e5c2 (diff) | |
download | rsyslog-dc760e8c672c2c896bc0d001fa1f7d9e02fe111c.tar.gz rsyslog-dc760e8c672c2c896bc0d001fa1f7d9e02fe111c.tar.bz2 rsyslog-dc760e8c672c2c896bc0d001fa1f7d9e02fe111c.zip |
Merge branch 'master-ruleeng' into master-ruleeng-simd
Diffstat (limited to 'plugins/mmfields/mmfields.c')
-rw-r--r-- | plugins/mmfields/mmfields.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/plugins/mmfields/mmfields.c b/plugins/mmfields/mmfields.c index fa7fa100..c408a6c9 100644 --- a/plugins/mmfields/mmfields.c +++ b/plugins/mmfields/mmfields.c @@ -56,6 +56,10 @@ typedef struct _instanceData { uchar *jsonRoot; /**< container where to store fields */ } instanceData; +typedef struct wrkrInstanceData { + instanceData *pData; +} wrkrInstanceData_t; + struct modConfData_s { rsconf_t *pConf; /* our overall config object */ }; @@ -103,6 +107,10 @@ BEGINcreateInstance CODESTARTcreateInstance ENDcreateInstance +BEGINcreateWrkrInstance +CODESTARTcreateWrkrInstance +ENDcreateWrkrInstance + BEGINisCompatibleWithFeature CODESTARTisCompatibleWithFeature @@ -114,6 +122,10 @@ CODESTARTfreeInstance free(pData->jsonRoot); ENDfreeInstance +BEGINfreeWrkrInstance +CODESTARTfreeWrkrInstance +ENDfreeWrkrInstance + static inline void setInstParamDefaults(instanceData *pData) @@ -232,7 +244,7 @@ CODESTARTdoAction pMsg = (msg_t*) ppString[0]; lenMsg = getMSGLen(pMsg); msg = getMSG(pMsg); - CHKiRet(parse_fields(pData, pMsg, msg, lenMsg)); + CHKiRet(parse_fields(pWrkrData->pData, pMsg, msg, lenMsg)); finalize_it: ENDdoAction @@ -259,6 +271,7 @@ ENDmodExit BEGINqueryEtryPt CODESTARTqueryEtryPt CODEqueryEtryPt_STD_OMOD_QUERIES +CODEqueryEtryPt_STD_OMOD8_QUERIES CODEqueryEtryPt_STD_CONF2_OMOD_QUERIES CODEqueryEtryPt_STD_CONF2_QUERIES ENDqueryEtryPt |