summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-10-14 11:16:43 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-10-14 11:16:43 +0200
commite6b2cba8038061ab7f1f324110eeabbc8dfe2c30 (patch)
treeb368a8766b2a50189ba8042d7020c6d5ff0412e1 /tools
parent17e24eae733a0bce0eda65947e7559a05c91fc9c (diff)
downloadrsyslog-e6b2cba8038061ab7f1f324110eeabbc8dfe2c30.tar.gz
rsyslog-e6b2cba8038061ab7f1f324110eeabbc8dfe2c30.tar.xz
rsyslog-e6b2cba8038061ab7f1f324110eeabbc8dfe2c30.zip
bugfix(minor): diag function returned wrong queue memeber count
...for the main queue if an active DA queue existed. This had no relevance to real deployments (assuming they are not running the debug/diagnostic module...), but sometimes caused grief and false alerts in the testbench.
Diffstat (limited to 'tools')
-rw-r--r--tools/syslogd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c
index 45c30baa..fb3294d5 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -411,7 +411,8 @@ diagGetMainMsgQSize(int *piSize)
{
DEFiRet;
assert(piSize != NULL);
- *piSize = pMsgQueue->iQueueSize;
+ *piSize = (pMsgQueue->pqDA != NULL) ? pMsgQueue->pqDA->iQueueSize : 0;
+ *piSize += pMsgQueue->iQueueSize;
RETiRet;
}