diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-07 15:42:46 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-07 15:42:46 +0200 |
| commit | d6da57ae0370aeb705f63fd04e575b5ed4684618 (patch) | |
| tree | d451907714559f5df60eb0cdef6ccbc205c812e4 /runtime/ruleset.c | |
| parent | d8ce489bae3ae072a2ee605cd90fa0530c9f3446 (diff) | |
| parent | bd8d972a975ce794dd71c1c8db724991dd4744a0 (diff) | |
| download | rsyslog-d6da57ae0370aeb705f63fd04e575b5ed4684618.tar.gz rsyslog-d6da57ae0370aeb705f63fd04e575b5ed4684618.tar.xz rsyslog-d6da57ae0370aeb705f63fd04e575b5ed4684618.zip | |
Merge branch 'v5-stable-newstats'
Conflicts:
action.c
configure.ac
doc/imuxsock.html
plugins/imklog/imklog.c
plugins/imptcp/imptcp.c
plugins/imtcp/imtcp.c
plugins/imudp/imudp.c
plugins/imuxsock/imuxsock.c
runtime/glbl.c
runtime/glbl.h
runtime/net.c
runtime/ruleset.c
tcpsrv.h
tools/syslogd.c
Diffstat (limited to 'runtime/ruleset.c')
| -rw-r--r-- | runtime/ruleset.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/runtime/ruleset.c b/runtime/ruleset.c index 00d96714..2788f34c 100644 --- a/runtime/ruleset.c +++ b/runtime/ruleset.c @@ -497,6 +497,7 @@ debugPrintAll(rsconf_t *conf) static inline rsRetVal doRulesetCreateQueue(rsconf_t *conf, int *pNewVal) { + uchar *rulesetMainQName; DEFiRet; if(conf->rulesets.pCurr == NULL) { @@ -515,7 +516,9 @@ doRulesetCreateQueue(rsconf_t *conf, int *pNewVal) FINALIZE; /* if it is turned off, we do not need to change anything ;) */ dbgprintf("adding a ruleset-specific \"main\" queue"); - CHKiRet(createMainQueue(&conf->rulesets.pCurr->pQueue, UCHAR_CONSTANT("ruleset"))); + rulesetMainQName = (conf->rulesets.pCurr->pszName == NULL)? UCHAR_CONSTANT("ruleset") : + conf->rulesets.pCurr->pszName; + CHKiRet(createMainQueue(&conf->rulesets.pCurr->pQueue, rulesetMainQName)); finalize_it: RETiRet; |