summaryrefslogtreecommitdiffstats
path: root/action.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-06-26 13:42:52 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-06-26 13:42:52 +0200
commitd88803c8e471b0b822108106137f5383c7efd57e (patch)
treef8da7e5eb6998f304050afaf28e47ec164dcbf0a /action.c
parent464dcf2339634a2cda0244011abe7ed8f6ed2fe5 (diff)
downloadrsyslog-d88803c8e471b0b822108106137f5383c7efd57e.tar.gz
rsyslog-d88803c8e471b0b822108106137f5383c7efd57e.tar.xz
rsyslog-d88803c8e471b0b822108106137f5383c7efd57e.zip
got rid of the recursive requirement for msg_t mutex (finally!)
Diffstat (limited to 'action.c')
-rw-r--r--action.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/action.c b/action.c
index d1d2b78d..f21feea6 100644
--- a/action.c
+++ b/action.c
@@ -782,8 +782,8 @@ doActionCallAction(action_t *pAction, msg_t *pMsg)
(pMsg->msgFlags & MARK) == 0 && getMSGLen(pMsg) == getMSGLen(pAction->f_pMsg) &&
!strcmp(getMSG(pMsg), getMSG(pAction->f_pMsg)) &&
!strcmp(getHOSTNAME(pMsg), getHOSTNAME(pAction->f_pMsg)) &&
- !strcmp(getPROCID(pMsg), getPROCID(pAction->f_pMsg)) &&
- !strcmp(getAPPNAME(pMsg), getAPPNAME(pAction->f_pMsg))) {
+ !strcmp(getPROCID(pMsg, LOCK_MUTEX), getPROCID(pAction->f_pMsg, LOCK_MUTEX)) &&
+ !strcmp(getAPPNAME(pMsg, LOCK_MUTEX), getAPPNAME(pAction->f_pMsg, LOCK_MUTEX))) {
pAction->f_prevcount++;
dbgprintf("msg repeated %d times, %ld sec of %d.\n",
pAction->f_prevcount, (long) getActNow(pAction) - pAction->f_time,