added omruleset output module, which provides great flexibility in action processing.

THIS IS A VERY IMPORTANT ADDITION, see its doc for why.

4 files changed, 23 insertions, 19 deletions

diff --git a/runtime/objomsr.c b/runtime/objomsr.c
index 8dddc4b8..1d442c61 100644
--- a/runtime/objomsr.c
+++ b/runtime/objomsr.c
@@ -67,31 +67,25 @@ rsRetVal OMSRconstruct(omodStringRequest_t **ppThis, int iNumEntries)
 
 	assert(ppThis != NULL);
 	assert(iNumEntries >= 0);
-	if((pThis = calloc(1, sizeof(omodStringRequest_t))) == NULL) {
-		iRet = RS_RET_OUT_OF_MEMORY;
-		goto abort_it;
-	}
+	CHKmalloc(pThis = calloc(1, sizeof(omodStringRequest_t)));
 
 	/* got the structure, so fill it */
 	pThis->iNumEntries = iNumEntries;
 	/* allocate string for template name array. The individual strings will be
 	 * allocated as the code progresses (we do not yet know the string sizes)
 	 */
-	if((pThis->ppTplName = calloc(iNumEntries, sizeof(uchar*))) == NULL) {
-		OMSRdestruct(pThis);
-		pThis = NULL;
-		iRet =  RS_RET_OUT_OF_MEMORY;
-		goto abort_it;
-	}
+	CHKmalloc(pThis->ppTplName = calloc(iNumEntries, sizeof(uchar*)));
+
 	/* allocate the template options array. */
-	if((pThis->piTplOpts = calloc(iNumEntries, sizeof(int))) == NULL) {
-		OMSRdestruct(pThis);
-		pThis = NULL;
-		iRet =  RS_RET_OUT_OF_MEMORY;
-		goto abort_it;
-	}
+	CHKmalloc(pThis->piTplOpts = calloc(iNumEntries, sizeof(int)));
 	
-abort_it:
+finalize_it:
+	if(iRet != RS_RET_OK) {
+		if(pThis != NULL) {
+			OMSRdestruct(pThis);
+			pThis = NULL;
+		}
+	}
 	*ppThis = pThis;
 	RETiRet;
 }
@@ -155,7 +149,7 @@ OMSRgetSupportedTplOpts(unsigned long *pOpts)
 {
 	DEFiRet;
 	assert(pOpts != NULL);
-	*pOpts = OMSR_RQD_TPL_OPT_SQL | OMSR_TPL_AS_ARRAY;
+	*pOpts = OMSR_RQD_TPL_OPT_SQL | OMSR_TPL_AS_ARRAY | OMSR_TPL_AS_MSG;
 	RETiRet;
 }
 
diff --git a/runtime/objomsr.h b/runtime/objomsr.h
index 75ad0fb8..e59b774f 100644
--- a/runtime/objomsr.h
+++ b/runtime/objomsr.h
@@ -27,8 +27,12 @@
 /* define flags for required template options */
 #define OMSR_NO_RQD_TPL_OPTS	0
 #define OMSR_RQD_TPL_OPT_SQL	1
+/* only one of OMSR_TPL_AS_ARRAY or _AS_MSG must be specified, if both are given
+ * results are unpredictable.
+ */
 #define OMSR_TPL_AS_ARRAY	2	 /* introduced in 4.1.6, 2009-04-03 */
-/* next option is 4, 8, 16, ... */
+#define OMSR_TPL_AS_MSG		4	 /* introduced in 5.3.4, 2009-11-02 */
+/* next option is 8, 16, 32, ... */
 
 struct omodStringRequest_s {	/* strings requested by output module for doAction() */
 	int iNumEntries;	/* number of array entries for data elements below */
diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h
index 7c966276..f059a970 100644
--- a/runtime/rsyslog.h
+++ b/runtime/rsyslog.h
@@ -390,6 +390,9 @@ enum rsRetVal_				/** return value. All methods return this if not specified oth
 	RS_RET_FORCE_TERM = -2153,	/**< thread was forced to terminate by bShallShutdown, a state, not an error */
 	RS_RET_RULES_QUEUE_EXISTS = -2154,/**< we were instructed to create a new ruleset queue, but one already exists */
 	RS_RET_NO_CURR_RULESET = -2155,/**< no current ruleset exists (but one is required) */
+	RS_RET_NO_MSG_PASSING = -2156,/**< output module interface parameter passing mode "MSG" is not available but required */
+	RS_RET_RULESET_NOT_FOUND = -2157,/**< a required ruleset could not be found */
+	RS_RET_NO_RULESET= -2158,/**< no ruleset name as specified where one was needed */
 
 	/* RainerScript error messages (range 1000.. 1999) */
 	RS_RET_SYSVAR_NOT_FOUND = 1001, /**< system variable could not be found (maybe misspelled) */
diff --git a/runtime/ruleset.c b/runtime/ruleset.c
index 3592aafd..975ed3ed 100644
--- a/runtime/ruleset.c
+++ b/runtime/ruleset.c
@@ -334,6 +334,9 @@ finalize_it:
 BEGINobjDestruct(ruleset) /* be sure to specify the object type also in END and CODESTART macros! */
 CODESTARTobjDestruct(ruleset)
 	dbgprintf("destructing ruleset %p, name %p\n", pThis, pThis->pszName);
+	if(pThis->pQueue != NULL) {
+		qqueueDestruct(&pThis->pQueue);
+	}
 	llDestroy(&pThis->llRules);
 	free(pThis->pszName);
 ENDobjDestruct(ruleset)