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 /tools | |
| 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
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/syslogd.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; } |