diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-26 13:42:52 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-26 13:42:52 +0200 |
| commit | d88803c8e471b0b822108106137f5383c7efd57e (patch) | |
| tree | f8da7e5eb6998f304050afaf28e47ec164dcbf0a /runtime/rule.c | |
| parent | 464dcf2339634a2cda0244011abe7ed8f6ed2fe5 (diff) | |
| download | rsyslog-d88803c8e471b0b822108106137f5383c7efd57e.tar.gz rsyslog-d88803c8e471b0b822108106137f5383c7efd57e.tar.xz rsyslog-d88803c8e471b0b822108106137f5383c7efd57e.zip | |
got rid of the recursive requirement for msg_t mutex (finally!)
Diffstat (limited to 'runtime/rule.c')
| -rw-r--r-- | runtime/rule.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/runtime/rule.c b/runtime/rule.c index 12494543..221368e6 100644 --- a/runtime/rule.c +++ b/runtime/rule.c @@ -147,13 +147,14 @@ shouldProcessThisMessage(rule_t *pRule, msg_t *pMsg, int *bProcessMsg) offset = 1; } } - if(!rsCStrOffsetSzStrCmp(pRule->pCSProgNameComp, offset, (uchar*) getProgramName(pMsg), getProgramNameLen(pMsg))) + if(!rsCStrOffsetSzStrCmp(pRule->pCSProgNameComp, offset, + (uchar*) getProgramName(pMsg, LOCK_MUTEX), getProgramNameLen(pMsg, LOCK_MUTEX))) bEqv = 1; if((!bEqv && !bInv) || (bEqv && bInv)) { /* not equal or inverted selection, so we are already done... */ - dbgprintf("programname filter '%s' does not match '%s'\n", - rsCStrGetSzStrNoNULL(pRule->pCSProgNameComp), getProgramName(pMsg)); + DBGPRINTF("programname filter '%s' does not match '%s'\n", + rsCStrGetSzStrNoNULL(pRule->pCSProgNameComp), getProgramName(pMsg, LOCK_MUTEX)); FINALIZE; } } |