summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-12-01 09:37:13 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-12-01 09:37:13 +0100
commitcbfa21f8230d211cc1dfc3284c8d4437b6c5ebc1 (patch)
treefd818eac986495b489731f0e4b32650d79708b83 /plugins
parentb9d3cdceabf91bc28f8f6d31cfe9332724e37bbf (diff)
downloadrsyslog-cbfa21f8230d211cc1dfc3284c8d4437b6c5ebc1.tar.gz
rsyslog-cbfa21f8230d211cc1dfc3284c8d4437b6c5ebc1.tar.xz
rsyslog-cbfa21f8230d211cc1dfc3284c8d4437b6c5ebc1.zip
mmnormalize loads & runs (basic testing done)
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mmnormalize/Makefile.am4
-rw-r--r--plugins/mmnormalize/mmnormalize.c12
2 files changed, 14 insertions, 2 deletions
diff --git a/plugins/mmnormalize/Makefile.am b/plugins/mmnormalize/Makefile.am
index cda11e2d..0a3b5ba5 100644
--- a/plugins/mmnormalize/Makefile.am
+++ b/plugins/mmnormalize/Makefile.am
@@ -1,8 +1,8 @@
pkglib_LTLIBRARIES = mmnormalize.la
mmnormalize_la_SOURCES = mmnormalize.c
-mmnormalize_la_CPPFLAGS = $(RSRT_CFLAGS) $(PTHREADS_CFLAGS) $(LIBLOGNORM_CFLAGS)
-mmnormalize_la_LDFLAGS = -module -avoid-version
+mmnormalize_la_CPPFLAGS = $(RSRT_CFLAGS) $(PTHREADS_CFLAGS) $(LIBLOGNORM_CFLAGS) $(LIBEE_CFLAGS)
+mmnormalize_la_LDFLAGS = -module -avoid-version $(LIBLOGNORM_LIBS) $(LIBEE_LIBS)
mmnormalize_la_LIBADD =
EXTRA_DIST =
diff --git a/plugins/mmnormalize/mmnormalize.c b/plugins/mmnormalize/mmnormalize.c
index 6c0293cf..8da8f7eb 100644
--- a/plugins/mmnormalize/mmnormalize.c
+++ b/plugins/mmnormalize/mmnormalize.c
@@ -126,6 +126,17 @@ CODESTARTdoAction
if(r != 0) {
DBGPRINTF("error %d during ln_normalize\n", r);
}
+ /***DEBUG***/
+ {
+ dbgprintf("mmnormalize: event ptr now is %p\n", pMsg->event);
+ char *cstr;
+ es_emptyStr(str);
+ ee_fmtEventToJSON(pMsg->event, &str);
+ cstr = es_str2cstr(str, NULL);
+ dbgprintf("mmnormalize generated: %s\n", cstr);
+ free(cstr);
+ }
+ /***END DEBUG***/
es_deleteStr(str);
ENDdoAction
@@ -169,6 +180,7 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1)
ee_exitCtx(pData->ctxee);
ABORT_FINALIZE(RS_RET_ERR_LIBLOGNORM_INIT);
}
+ ln_setEECtx(pData->ctxln, pData->ctxee);
if(ln_loadSamples(pData->ctxln, (char*) cs.sampdb) != 0) {
errmsg.LogError(0, RS_RET_NO_RULESET, "error: sample db '%s' could not be loaded "
"cannot activate action", cs.sampdb);