From b727710289a6f535c8d2c17caa4c4c11d8c9cd8b Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 2 Aug 2007 16:36:03 +0000
Subject: some cleanup

---
 ChangeLog | 3 ++-
 omfwd.c   | 2 --
 ommysql.c | 1 +
 syslogd.c | 3 ---
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3af94781..637223ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 ---------------------------------------------------------------------------
-Version 1.17.7 (rgerhards), 2007-08-??
+Version 1.17.7 (rgerhards), 2007-08-0?
 - modified rklogd to only change the console log level if -c is specified
+- added feature to use multiple actions inside a single selector
 - implemented $ActionExecOnlyWhenPreviousIsSuspended config directive
 ---------------------------------------------------------------------------
 Version 1.17.6 (rgerhards), 2007-08-01
diff --git a/omfwd.c b/omfwd.c
index 5dee002c..c6a6ebd8 100644
--- a/omfwd.c
+++ b/omfwd.c
@@ -590,7 +590,6 @@ static rsRetVal doTryResume(instanceData *pData)
 BEGINtryResume
 CODESTARTtryResume
 	iRet = doTryResume(pData);
-dprintf("tryResume returns %d\n", iRet);
 ENDtryResume
 
 BEGINdoAction
@@ -714,7 +713,6 @@ CODESTARTdoAction
 		}
 		break;
 	}
-dprintf("doAction returns %d\n", iRet);
 ENDdoAction
 
 
diff --git a/ommysql.c b/ommysql.c
index af562b43..ea0012b1 100644
--- a/ommysql.c
+++ b/ommysql.c
@@ -321,6 +321,7 @@ rsRetVal writeMySQL(uchar *psz, instanceData *pData)
 
 BEGINtryResume
 CODESTARTtryResume
+dprintf("tryResume returns %d\n", iRet);
 ENDtryResume
 
 BEGINdoAction
diff --git a/syslogd.c b/syslogd.c
index b25439fb..1888d47d 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -1900,7 +1900,6 @@ static rsRetVal actionResume(action_t *pThis)
 {
 	DEFiRet;
 
-dprintf("actionResume\n");
 	assert(pThis != NULL);
 	pThis->bSuspended = 0;
 
@@ -1915,7 +1914,6 @@ static rsRetVal actionSuspend(action_t *pThis)
 {
 	DEFiRet;
 
-dprintf("actionSuspend\n");
 	assert(pThis != NULL);
 	pThis->bSuspended = 1;
 	pThis->ttResumeRtry = time(NULL) + ACTION_RESUME_INTERVAL;
@@ -5117,7 +5115,6 @@ DEFFUNC_llExecFunc(selectorAddListCheckActionsChecker)
 
 	assert(pAction != NULL);
 
-dprintf("selectorAddListCheckActionsChecker 0x%x\n", (unsigned) pAction);
 	if(pAction->pMod->needUDPSocket(pAction->pModData) == RS_RET_TRUE) {
 		Forwarding++;
 	}
-- 
cgit v1.2.3