diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2007-08-02 16:36:03 +0000 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2007-08-02 16:36:03 +0000 |
commit | b727710289a6f535c8d2c17caa4c4c11d8c9cd8b (patch) | |
tree | 04b2e6aed571e4ed9b9f3c1708baa31be51ef948 | |
parent | 3aaa3ac894b21a21fb601e1a74664cb795e8e39b (diff) | |
download | rsyslog-b727710289a6f535c8d2c17caa4c4c11d8c9cd8b.tar.gz rsyslog-b727710289a6f535c8d2c17caa4c4c11d8c9cd8b.tar.xz rsyslog-b727710289a6f535c8d2c17caa4c4c11d8c9cd8b.zip |
some cleanup
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | omfwd.c | 2 | ||||
-rw-r--r-- | ommysql.c | 1 | ||||
-rw-r--r-- | syslogd.c | 3 |
4 files changed, 3 insertions, 6 deletions
@@ -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 @@ -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 @@ -321,6 +321,7 @@ rsRetVal writeMySQL(uchar *psz, instanceData *pData) BEGINtryResume CODESTARTtryResume +dprintf("tryResume returns %d\n", iRet); ENDtryResume BEGINdoAction @@ -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++; } |