diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-14 11:16:43 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-14 11:16:43 +0200 |
| commit | e6b2cba8038061ab7f1f324110eeabbc8dfe2c30 (patch) | |
| tree | b368a8766b2a50189ba8042d7020c6d5ff0412e1 | |
| parent | 17e24eae733a0bce0eda65947e7559a05c91fc9c (diff) | |
| download | rsyslog-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.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | tools/syslogd.c | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -1,5 +1,10 @@ --------------------------------------------------------------------------- Version 4.5.6 [v4-beta] (rgerhards), 2009-09-?? +- 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. - included some important fixes from v4-stable: * bugfix: invalid handling of zero-sized messages * bugfix: zero-sized UDP messages are no longer processed 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; } |