mirror of
https://github.com/rsyslog/rsyslog.git
synced 2025-12-20 13:10:43 +01:00
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.
This commit is contained in:
parent
2716bc9ffc
commit
11172b62b0
8
action.c
8
action.c
@ -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;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user