diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-12 17:00:21 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-12 17:00:21 +0100 |
| commit | f90675f33f33b8a83046f8a8462dd8dbe7648a4a (patch) | |
| tree | f695e6371b52141de4c4ce2295b317a1e487e7b3 /runtime/ruleset.c | |
| parent | 14d415e4a84e2c08df1b23a86959f0d9b0006687 (diff) | |
| parent | 74e09afd6db56f6e23c965f0949cfb9979928f13 (diff) | |
| download | rsyslog-f90675f33f33b8a83046f8a8462dd8dbe7648a4a.tar.gz rsyslog-f90675f33f33b8a83046f8a8462dd8dbe7648a4a.tar.xz rsyslog-f90675f33f33b8a83046f8a8462dd8dbe7648a4a.zip | |
Merge branch 'v5-stable-newstats' into v5-devel
Conflicts:
ChangeLog
action.c
configure.ac
doc/imuxsock.html
doc/manual.html
runtime/queue.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 5ee2a55a..69968a52 100644 --- a/runtime/ruleset.c +++ b/runtime/ruleset.c @@ -500,6 +500,7 @@ debugPrintAll(void) static rsRetVal rulesetCreateQueue(void __attribute__((unused)) *pVal, int *pNewVal) { + uchar *rulesetMainQName; DEFiRet; if(pCurrRuleset == NULL) { @@ -518,7 +519,9 @@ rulesetCreateQueue(void __attribute__((unused)) *pVal, int *pNewVal) FINALIZE; /* if it is turned off, we do not need to change anything ;) */ dbgprintf("adding a ruleset-specific \"main\" queue"); - CHKiRet(createMainQueue(&pCurrRuleset->pQueue, UCHAR_CONSTANT("ruleset"))); + rulesetMainQName = (pCurrRuleset->pszName == NULL)? UCHAR_CONSTANT("ruleset") : + pCurrRuleset->pszName; + CHKiRet(createMainQueue(&pCurrRuleset->pQueue, rulesetMainQName)); finalize_it: RETiRet; |