diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-26 14:09:15 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-26 14:09:15 +0200 |
| commit | d22f240bc3525f7e112ce44aea6b9f87f8a51c8a (patch) | |
| tree | 338334b847fdf1a199a55bdf73d9a1dad02498ed /action.c | |
| parent | c7b309a662a4310a8b878c036d9440e0b2e345a8 (diff) | |
| parent | 6be06d50e328c4b8c79b263e176e6b4e384a03f9 (diff) | |
| download | rsyslog-d22f240bc3525f7e112ce44aea6b9f87f8a51c8a.tar.gz rsyslog-d22f240bc3525f7e112ce44aea6b9f87f8a51c8a.tar.xz rsyslog-d22f240bc3525f7e112ce44aea6b9f87f8a51c8a.zip | |
Merge branch 'master' into v5-devel
Diffstat (limited to 'action.c')
| -rw-r--r-- | action.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1182,8 +1182,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, |