diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-14 11:17:39 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-14 11:17:39 +0200 |
commit | faf4070924d61b77ba353781cd8b57be15669c68 (patch) | |
tree | b53003c38fd10236b233fb7f8cf110bce86de5fa | |
parent | ed2cd2806e0cf00990c73f184698bf683ee10cc2 (diff) | |
parent | e6b2cba8038061ab7f1f324110eeabbc8dfe2c30 (diff) | |
download | rsyslog-faf4070924d61b77ba353781cd8b57be15669c68.tar.gz rsyslog-faf4070924d61b77ba353781cd8b57be15669c68.tar.xz rsyslog-faf4070924d61b77ba353781cd8b57be15669c68.zip |
Merge branch 'v4-beta' into v4-devel
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | tools/syslogd.c | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -14,6 +14,11 @@ Version 4.7.0 [v4-devel] (rgerhards), 2009-09-?? - imported changes from 4.5.6 and below --------------------------------------------------------------------------- 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 d99fb84d..5ab7a6f4 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -414,7 +414,8 @@ diagGetMainMsgQSize(int *piSize) { DEFiRet; assert(piSize != NULL); - *piSize = pMsgQueue->iQueueSize; + *piSize = (pMsgQueue->pqDA != NULL) ? pMsgQueue->pqDA->iQueueSize : 0; + *piSize += pMsgQueue->iQueueSize; RETiRet; } |