summaryrefslogtreecommitdiffstats
path: root/plugins/mmpstrucdata/mmpstrucdata.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-11-13 13:15:15 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2013-11-13 13:15:15 +0100
commitdc760e8c672c2c896bc0d001fa1f7d9e02fe111c (patch)
tree89609f09d667ab7db2f60139eb59524458a57f60 /plugins/mmpstrucdata/mmpstrucdata.c
parent23278699e35173f46effda964fd80b8f868e8b3e (diff)
parent45a4134a8b5c9111398be3458bd27b4aa2f0e5c2 (diff)
downloadrsyslog-dc760e8c672c2c896bc0d001fa1f7d9e02fe111c.tar.gz
rsyslog-dc760e8c672c2c896bc0d001fa1f7d9e02fe111c.tar.bz2
rsyslog-dc760e8c672c2c896bc0d001fa1f7d9e02fe111c.zip
Merge branch 'master-ruleeng' into master-ruleeng-simd
Diffstat (limited to 'plugins/mmpstrucdata/mmpstrucdata.c')
-rw-r--r--plugins/mmpstrucdata/mmpstrucdata.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/plugins/mmpstrucdata/mmpstrucdata.c b/plugins/mmpstrucdata/mmpstrucdata.c
index 4b2a985b..e9e36b27 100644
--- a/plugins/mmpstrucdata/mmpstrucdata.c
+++ b/plugins/mmpstrucdata/mmpstrucdata.c
@@ -52,6 +52,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 */
};
@@ -98,6 +102,10 @@ BEGINcreateInstance
CODESTARTcreateInstance
ENDcreateInstance
+BEGINcreateWrkrInstance
+CODESTARTcreateWrkrInstance
+ENDcreateWrkrInstance
+
BEGINisCompatibleWithFeature
CODESTARTisCompatibleWithFeature
@@ -109,6 +117,10 @@ CODESTARTfreeInstance
free(pData->jsonRoot);
ENDfreeInstance
+BEGINfreeWrkrInstance
+CODESTARTfreeWrkrInstance
+ENDfreeWrkrInstance
+
static inline void
setInstParamDefaults(instanceData *pData)
@@ -357,7 +369,7 @@ dbgprintf("DDDD: parse mmpstrucdata\n");
/* don't check return code - we never want rsyslog to retry
* or suspend this action!
*/
- parse_sd(pData, pMsg);
+ parse_sd(pWrkrData->pData, pMsg);
dbgprintf("DDDD: done parse mmpstrucdata\n");
finalize_it:
ENDdoAction
@@ -385,6 +397,7 @@ ENDmodExit
BEGINqueryEtryPt
CODESTARTqueryEtryPt
CODEqueryEtryPt_STD_OMOD_QUERIES
+CODEqueryEtryPt_STD_OMOD8_QUERIES
CODEqueryEtryPt_STD_CONF2_OMOD_QUERIES
CODEqueryEtryPt_STD_CONF2_QUERIES
ENDqueryEtryPt