diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-11 10:41:52 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-11 10:41:52 +0200 |
| commit | 28551c791bba444cdf1aef753ad15b9410d7a04a (patch) | |
| tree | 102cfb96ce0d2f6ec24cbb3fd41ebc777d5cf84f /runtime | |
| parent | 44dab25c55b41219dd9e865c3aac93114757f5ba (diff) | |
| parent | cdae37d737cae680a96dead7a322b2ee975c92a1 (diff) | |
| download | rsyslog-28551c791bba444cdf1aef753ad15b9410d7a04a.tar.gz rsyslog-28551c791bba444cdf1aef753ad15b9410d7a04a.tar.xz rsyslog-28551c791bba444cdf1aef753ad15b9410d7a04a.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
runtime/queue.c
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/queue.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/runtime/queue.c b/runtime/queue.c index 50ae307c..88e01a7a 100644 --- a/runtime/queue.c +++ b/runtime/queue.c @@ -2279,6 +2279,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 */ @@ -2306,6 +2307,7 @@ qqueueMultiEnqObjNonDirect(qqueue_t *pThis, multi_submit_t *pMultiSub) { int iCancelStateSave; int i; + rsRetVal localRet; DEFiRet; ISOBJ_TYPE_assert(pThis, qqueue); @@ -2314,7 +2316,9 @@ qqueueMultiEnqObjNonDirect(qqueue_t *pThis, multi_submit_t *pMultiSub) pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &iCancelStateSave); d_pthread_mutex_lock(pThis->mut); for(i = 0 ; i < pMultiSub->nElem ; ++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); } qqueueChkPersist(pThis, pMultiSub->nElem); |