diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-14 11:17:55 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-14 11:17:55 +0200 |
| commit | 225483127e13aa59ae3286772342c73bc600e2b8 (patch) | |
| tree | 83e897fbfe29a6172da6ce8e6b6c9336032ab399 /tools | |
| parent | f094fcb2616127b02999e40442895553c6cfd747 (diff) | |
| parent | e6b2cba8038061ab7f1f324110eeabbc8dfe2c30 (diff) | |
| download | rsyslog-225483127e13aa59ae3286772342c73bc600e2b8.tar.gz rsyslog-225483127e13aa59ae3286772342c73bc600e2b8.tar.xz rsyslog-225483127e13aa59ae3286772342c73bc600e2b8.zip | |
Merge branch 'v4-beta' into beta
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 895ac5d6..165c751b 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -413,7 +413,8 @@ diagGetMainMsgQSize(int *piSize) { DEFiRet; assert(piSize != NULL); - *piSize = pMsgQueue->iQueueSize; + *piSize = (pMsgQueue->pqDA != NULL) ? pMsgQueue->pqDA->iQueueSize : 0; + *piSize += pMsgQueue->iQueueSize; RETiRet; } |