diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-20 11:48:17 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-20 11:48:17 +0200 |
| commit | ac32d356b5b776e0ca549d5c689a8932af4c2171 (patch) | |
| tree | d8aa8631ec9b7aae850801be4076d71a652e483e /runtime | |
| parent | fd4a54698cee48da073622f7d6ac49c94ccb1808 (diff) | |
| parent | 1d86889922cb9232819b4451afce091e8a0ad938 (diff) | |
| download | rsyslog-ac32d356b5b776e0ca549d5c689a8932af4c2171.tar.gz rsyslog-ac32d356b5b776e0ca549d5c689a8932af4c2171.tar.xz rsyslog-ac32d356b5b776e0ca549d5c689a8932af4c2171.zip | |
Merge branch 'v5-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
doc/rsyslog_conf_modules.html
plugins/imrelp/imrelp.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); |