implemented $OMFileFlushOnTXEnd directive

plus some cleanup...

2 files changed, 6 insertions, 11 deletions

diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h
index 28f7bce9..9421ca67 100644
--- a/runtime/rsyslog.h
+++ b/runtime/rsyslog.h
@@ -125,14 +125,6 @@ typedef enum {
 	FIOP_EREREGEX = 5	/* matches a ERE regular expression? */
 } fiop_t;
 
-/* file types (omfile & stream) */
-typedef enum {
-	eTypeFILE,
-	eTypeTTY,
-	eTypeCONSOLE,
-	eTypePIPE
-} filetype_t;
-
 
 #ifndef _PATH_CONSOLE
 #define _PATH_CONSOLE	"/dev/console"
diff --git a/runtime/ruleset.c b/runtime/ruleset.c
index a1454275..f9edde8b 100644
--- a/runtime/ruleset.c
+++ b/runtime/ruleset.c
@@ -68,7 +68,7 @@ static rsRetVal keyDestruct(void __attribute__((unused)) *pData)
 /* ---------- END linked-list key handling functions ---------- */
 
 
-/* dirver to iterate over all of this ruleset actions */
+/* driver to iterate over all of this ruleset actions */
 typedef struct iterateAllActions_s {
 	rsRetVal (*pFunc)(void*, void*);
 	void *pParam;
@@ -81,6 +81,7 @@ DEFFUNC_llExecFunc(doIterateRulesetActions)
 	iRet = rule.IterateAllActions(pRule, pMyParam->pFunc, pMyParam->pParam);
 	RETiRet;
 }
+#if 0
 /* iterate over all actions of THIS rule set.
  */
 static rsRetVal
@@ -99,7 +100,7 @@ finalize_it:
 }
 
 
-/* dirver to iterate over all actions */
+/* driver to iterate over all actions */
 DEFFUNC_llExecFunc(doIterateAllActions)
 {
 	DEFiRet;
@@ -108,6 +109,7 @@ DEFFUNC_llExecFunc(doIterateAllActions)
 	iRet = iterateRulesetAllActions(pThis, pMyParam->pFunc, pMyParam->pParam);
 	RETiRet;
 }
+#endif
 /* iterate over ALL actions present in the WHOLE system.
  * this is often needed, for example when HUP processing 
  * must be done or a shutdown is pending.
@@ -121,7 +123,8 @@ iterateAllActions(rsRetVal (*pFunc)(void*, void*), void* pParam)
 
 	params.pFunc = pFunc;
 	params.pParam = pParam;
-	CHKiRet(llExecFunc(&llRulesets, doIterateAllActions, &params));
+	//CHKiRet(llExecFunc(&llRulesets, doIterateAllActions, &params));
+	CHKiRet(llExecFunc(&llRulesets, doIterateRulesetActions, &params));
 
 finalize_it:
 	RETiRet;