diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-25 12:27:06 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-25 12:27:06 +0200 |
| commit | 27a0078958d808a323c945b58b77ee96ee690444 (patch) | |
| tree | 2bcd479d0e5b42dd92c715e917722d6519c922b0 /runtime/ruleset.c | |
| parent | 1eac94e11dab1e7caead5e31a57d2cae31b5ad62 (diff) | |
| parent | de71589ca3145dfbe8e34790bb49e3d86d3d3bce (diff) | |
| download | rsyslog-27a0078958d808a323c945b58b77ee96ee690444.tar.gz rsyslog-27a0078958d808a323c945b58b77ee96ee690444.tar.xz rsyslog-27a0078958d808a323c945b58b77ee96ee690444.zip | |
Merge branch 'master' into master-newtemplate
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 ecded4a3..5cb34148 100644 --- a/runtime/ruleset.c +++ b/runtime/ruleset.c @@ -497,7 +497,7 @@ debugPrintAll(rsconf_t *conf) static inline rsRetVal doRulesetCreateQueue(rsconf_t *conf, int *pNewVal) { - uchar *rulesetMainQName; + uchar *rsname; DEFiRet; if(conf->rulesets.pCurr == NULL) { @@ -515,10 +515,9 @@ doRulesetCreateQueue(rsconf_t *conf, 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 = (conf->rulesets.pCurr->pszName == NULL)? UCHAR_CONSTANT("ruleset") : - conf->rulesets.pCurr->pszName; - CHKiRet(createMainQueue(&conf->rulesets.pCurr->pQueue, rulesetMainQName)); + rsname = (conf->rulesets.pCurr->pszName == NULL) ? (uchar*) "[ruleset]" : conf->rulesets.pCurr->pszName; + DBGPRINTF("adding a ruleset-specific \"main\" queue for ruleset '%s'\n", rsname); + CHKiRet(createMainQueue(&conf->rulesets.pCurr->pQueue, rsname)); finalize_it: RETiRet; |