diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-25 11:55:41 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-25 11:55:41 +0200 |
| commit | 8939ccfffd3a0580ead376234ad64a9602d4e4e6 (patch) | |
| tree | 1749d023b626b2d30d9b9273b0d4f11fcbffea1b /runtime/ruleset.c | |
| parent | 0f52727043736b1e411bc60309ed18d41a4f1234 (diff) | |
| parent | 0c65e62965eefc1f8cebfaa3636ef72fc21c5260 (diff) | |
| download | rsyslog-8939ccfffd3a0580ead376234ad64a9602d4e4e6.tar.gz rsyslog-8939ccfffd3a0580ead376234ad64a9602d4e4e6.tar.xz rsyslog-8939ccfffd3a0580ead376234ad64a9602d4e4e6.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
ChangeLog
action.c
configure.ac
doc/manual.html
runtime/ruleset.c
template.h
threads.c
tools/syslogd.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 c384663a..a6eca307 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; |