diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-30 15:21:15 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-30 15:21:15 +0200 |
| commit | e397c34d2a6c7c1e4c116fd2363cb173e32eb2a2 (patch) | |
| tree | 878184db67626f2c6c0681afe046c5e250ed8906 /runtime/rule.c | |
| parent | de84a12f8a5f140c0f7b8e00f4cac92ef13cd866 (diff) | |
| download | rsyslog-e397c34d2a6c7c1e4c116fd2363cb173e32eb2a2.tar.gz rsyslog-e397c34d2a6c7c1e4c116fd2363cb173e32eb2a2.tar.xz rsyslog-e397c34d2a6c7c1e4c116fd2363cb173e32eb2a2.zip | |
finished transition to using inputName property
... plus some celanup and adding minor missing functionality
(the rule debug info again tell the property name, not just number).
Diffstat (limited to 'runtime/rule.c')
| -rw-r--r-- | runtime/rule.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/runtime/rule.c b/runtime/rule.c index ce19146b..3a257a90 100644 --- a/runtime/rule.c +++ b/runtime/rule.c @@ -219,8 +219,8 @@ shouldProcessThisMessage(rule_t *pRule, msg_t *pMsg, int *bProcessMsg) bRet = (bRet == 1) ? 0 : 1; if(Debug) { - dbgprintf("Filter: check for property '%d' (value '%s') ", - pRule->f_filterData.prop.propID, pszPropVal); + dbgprintf("Filter: check for property '%s' (value '%s') ", + propIDToName(pRule->f_filterData.prop.propID), pszPropVal); if(pRule->f_filterData.prop.isNegated) dbgprintf("NOT "); dbgprintf("%s '%s': %s\n", @@ -373,8 +373,7 @@ CODESTARTobjDebugPrint(rule) dbgprintf("EXPRESSION-BASED Filter: can currently not be displayed"); } else { dbgprintf("PROPERTY-BASED Filter:\n"); - dbgprintf("\tProperty.: '%d'\n", pThis->f_filterData.prop.propID); -// TODO: XXXX ADD idtostring()! + dbgprintf("\tProperty.: '%s'\n", propIDToName(pThis->f_filterData.prop.propID)); dbgprintf("\tOperation: "); if(pThis->f_filterData.prop.isNegated) dbgprintf("NOT "); |