diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-24 15:05:13 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-24 15:05:13 +0200 |
commit | 11172b62b0f0312fef6a4a0abca982a2a6301649 (patch) | |
tree | e2801ae871dff6f8b504106d5cc278bd25a63d1e /action.c | |
parent | 2716bc9ffc0b667ce63ea7407b6ca7742bf168ec (diff) | |
download | rsyslog-11172b62b0f0312fef6a4a0abca982a2a6301649.tar.gz rsyslog-11172b62b0f0312fef6a4a0abca982a2a6301649.tar.xz rsyslog-11172b62b0f0312fef6a4a0abca982a2a6301649.zip |
quick and dirty fix for one race condition
It is intentionally quick & dirty, as I would like to do some
better patch, if possible. For that, I probably need the commented-out
code, thus no delete.
Diffstat (limited to 'action.c')
-rw-r--r-- | action.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1240,7 +1240,7 @@ actionCallAction(action_t *pAction, msg_t *pMsg) /* We need to lock the mutex only for repeated line processing. * rgerhards, 2009-06-19 */ - if(pAction->f_ReduceRepeated == 1) { + //if(pAction->f_ReduceRepeated == 1) { pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &iCancelStateSave); LockObj(pAction); pthread_cleanup_push(mutexCancelCleanup, pAction->Sync_mut); @@ -1250,9 +1250,9 @@ actionCallAction(action_t *pAction, msg_t *pMsg) UnlockObj(pAction); pthread_cleanup_pop(0); /* remove mutex cleanup handler */ pthread_setcancelstate(iCancelStateSave, NULL); - } else { - iRet = doActionCallAction(pAction, pMsg); - } + //} else { + //iRet = doActionCallAction(pAction, pMsg); + //} RETiRet; } |