diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-14 11:19:15 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-14 11:19:15 +0200 |
commit | 5ae0148ed5f508b52f8a35947a4648d6e7187c7f (patch) | |
tree | e62dff7bf258530826dd013a9d15a3e5f56cec6f /tools/syslogd.c | |
parent | becc47cef625bfabf53589bb98ca10c352a4c824 (diff) | |
parent | 225483127e13aa59ae3286772342c73bc600e2b8 (diff) | |
download | rsyslog-5ae0148ed5f508b52f8a35947a4648d6e7187c7f.tar.gz rsyslog-5ae0148ed5f508b52f8a35947a4648d6e7187c7f.tar.xz rsyslog-5ae0148ed5f508b52f8a35947a4648d6e7187c7f.zip |
Merge branch 'beta'
Diffstat (limited to 'tools/syslogd.c')
-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 58046558..99ccd1f1 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -406,7 +406,8 @@ diagGetMainMsgQSize(int *piSize) { DEFiRet; assert(piSize != NULL); - *piSize = pMsgQueue->iQueueSize; + *piSize = (pMsgQueue->pqDA != NULL) ? pMsgQueue->pqDA->iQueueSize : 0; + *piSize += pMsgQueue->iQueueSize; RETiRet; } |