diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-11 10:16:07 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-11 10:16:07 +0200 |
| commit | 702bac6dd6b391fbbd7ef9b74a1e171d6a62c144 (patch) | |
| tree | 2259862e63f141dbd637b18a641d843d0dae0cea /runtime | |
| parent | 1d41b9540ccf8b6714135737855ab71ee75f4364 (diff) | |
| parent | cdae37d737cae680a96dead7a322b2ee975c92a1 (diff) | |
| download | rsyslog-702bac6dd6b391fbbd7ef9b74a1e171d6a62c144.tar.gz rsyslog-702bac6dd6b391fbbd7ef9b74a1e171d6a62c144.tar.xz rsyslog-702bac6dd6b391fbbd7ef9b74a1e171d6a62c144.zip | |
Merge branch 'v4-stable' into v4-devel
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/queue.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/runtime/queue.c b/runtime/queue.c index 0c9d863f..9c7f96d0 100644 --- a/runtime/queue.c +++ b/runtime/queue.c @@ -2209,6 +2209,7 @@ qqueueEnqObj(qqueue_t *pThis, flowControl_t flowCtlType, void *pUsr) objDestruct(pUsr); ABORT_FINALIZE(RS_RET_QUEUE_FULL); } + dbgoprint((obj_t*) pThis, "enqueueMsg: wait solved queue full condition, enqueing\n"); } /* and finally enqueue the message */ @@ -2295,6 +2296,7 @@ doEnqSingleObj(qqueue_t *pThis, flowControl_t flowCtlType, void *pUsr) objDestruct(pUsr); ABORT_FINALIZE(RS_RET_QUEUE_FULL); } + dbgoprint((obj_t*) pThis, "enqueueMsg: wait solved queue full condition, enqueing\n"); } /* and finally enqueue the message */ @@ -2318,6 +2320,7 @@ qqueueMultiEnqObj(qqueue_t *pThis, multi_submit_t *pMultiSub) { int iCancelStateSave; int i; + rsRetVal localRet; DEFiRet; ISOBJ_TYPE_assert(pThis, qqueue); @@ -2329,8 +2332,9 @@ qqueueMultiEnqObj(qqueue_t *pThis, multi_submit_t *pMultiSub) } for(i = 0 ; i < pMultiSub->nElem ; ++i) { -dbgprintf("queueMultiEnq: %d\n", i); - CHKiRet(doEnqSingleObj(pThis, pMultiSub->ppMsgs[i]->flowCtlType, (void*)pMultiSub->ppMsgs[i])); + localRet = doEnqSingleObj(pThis, pMultiSub->ppMsgs[i]->flowCtlType, (void*)pMultiSub->ppMsgs[i]); + if(localRet != RS_RET_OK && localRet != RS_RET_QUEUE_FULL) + ABORT_FINALIZE(localRet); } finalize_it: |