diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-07-17 19:32:11 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-07-17 19:32:11 +0200 |
| commit | 0f7622dd1f9a4b146324d432d421e46cdaa06c09 (patch) | |
| tree | d014226b96da8acc97af24e0bc939107b1c74bcf /runtime/queue.c | |
| parent | 1ea14f211ba0e7351c7da745a5411c7efdeb3cbd (diff) | |
| parent | 62090c416cd0b7f4b67a68a81b5c37e2d27cf84e (diff) | |
| download | rsyslog-0f7622dd1f9a4b146324d432d421e46cdaa06c09.tar.gz rsyslog-0f7622dd1f9a4b146324d432d421e46cdaa06c09.tar.bz2 rsyslog-0f7622dd1f9a4b146324d432d421e46cdaa06c09.zip | |
Merge branch 'v7-stable'
Diffstat (limited to 'runtime/queue.c')
| -rw-r--r-- | runtime/queue.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/runtime/queue.c b/runtime/queue.c index c9c236fd..cfb455da 100644 --- a/runtime/queue.c +++ b/runtime/queue.c @@ -898,7 +898,8 @@ static rsRetVal qDestructDisk(qqueue_t *pThis) DEFiRet; ASSERT(pThis != NULL); - + + free(pThis->pszQIFNam); if(pThis->tVars.disk.pWrite != NULL) strm.Destruct(&pThis->tVars.disk.pWrite); if(pThis->tVars.disk.pReadDeq != NULL) @@ -2596,7 +2597,9 @@ doEnqSingleObj(qqueue_t *pThis, flowControl_t flowCtlType, msg_t *pMsg) && pThis->tVars.disk.sizeOnDisk > pThis->sizeOnDiskMax)) { STATSCOUNTER_INC(pThis->ctrFull, pThis->mutCtrFull); if(pThis->toEnq == 0 || pThis->bEnqOnly) { - DBGOPRINT((obj_t*) pThis, "doEnqSingleObject: queue FULL - configured for immediate discarding QueueSize=%d MaxQueueSize=%d sizeOnDisk=%d sizeOnDiskMax=%d\n", pThis->iQueueSize, pThis->iMaxQueueSize, pThis->tVars.disk.sizeOnDisk, pThis->sizeOnDiskMax); + DBGOPRINT((obj_t*) pThis, "doEnqSingleObject: queue FULL - configured for immediate discarding QueueSize=%d " + "MaxQueueSize=%d sizeOnDisk=%lld sizeOnDiskMax=%lld\n", pThis->iQueueSize, pThis->iMaxQueueSize, + pThis->tVars.disk.sizeOnDisk, pThis->sizeOnDiskMax); STATSCOUNTER_INC(pThis->ctrFDscrd, pThis->mutCtrFDscrd); msgDestruct(&pMsg); ABORT_FINALIZE(RS_RET_QUEUE_FULL); |