diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-22 15:32:05 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-22 15:32:05 +0200 |
commit | 01fe0fd2ab8a19bdf61bda2256429726ba8e0b53 (patch) | |
tree | 22f2d50ae3f3d88ca2ec83f53dd9d6d2453b1817 /runtime/ruleset.c | |
parent | 9faf2240c4a8f09f3f6c2c9bbd47e48520524e03 (diff) | |
parent | d92ad440da788fea9f17bfa4b0185f12644bf714 (diff) | |
download | rsyslog-01fe0fd2ab8a19bdf61bda2256429726ba8e0b53.tar.gz rsyslog-01fe0fd2ab8a19bdf61bda2256429726ba8e0b53.tar.xz rsyslog-01fe0fd2ab8a19bdf61bda2256429726ba8e0b53.zip |
Merge branch 'v5-stable' into v5-beta
Conflicts:
runtime/ruleset.c
Diffstat (limited to 'runtime/ruleset.c')
-rw-r--r-- | runtime/ruleset.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/runtime/ruleset.c b/runtime/ruleset.c index 2f307f05..14dc4c74 100644 --- a/runtime/ruleset.c +++ b/runtime/ruleset.c @@ -500,7 +500,7 @@ debugPrintAll(void) static rsRetVal rulesetCreateQueue(void __attribute__((unused)) *pVal, int *pNewVal) { - uchar *rulesetMainQName; + uchar *rsname; DEFiRet; if(pCurrRuleset == NULL) { @@ -518,10 +518,9 @@ rulesetCreateQueue(void __attribute__((unused)) *pVal, int *pNewVal) if(pNewVal == 0) FINALIZE; /* if it is turned off, we do not need to change anything ;) */ - dbgprintf("adding a ruleset-specific \"main\" queue"); - rulesetMainQName = (pCurrRuleset->pszName == NULL)? UCHAR_CONSTANT("ruleset") : - pCurrRuleset->pszName; - CHKiRet(createMainQueue(&pCurrRuleset->pQueue, rulesetMainQName)); + rsname = (pCurrRuleset->pszName == NULL) ? (uchar*) "[ruleset]" : pCurrRuleset->pszName; + DBGPRINTF("adding a ruleset-specific \"main\" queue for ruleset '%s'\n", rsname); + CHKiRet(createMainQueue(&pCurrRuleset->pQueue, rsname)); finalize_it: RETiRet; |