diff options
author | Michael Biebl <biebl@debian.org> | 2011-05-19 22:53:09 +0200 |
---|---|---|
committer | Michael Biebl <biebl@debian.org> | 2011-05-19 22:53:09 +0200 |
commit | 734f0031f3366c83552de8b0e628949d47ff9487 (patch) | |
tree | 75cb2c0985c21bc7ffd6d06e94ec7fb420f2a1c4 /runtime/queue.c | |
parent | 2e96de39e5394008f97d6c194e507e629d836738 (diff) | |
download | rsyslog-734f0031f3366c83552de8b0e628949d47ff9487.tar.gz |
Imported Upstream version 5.8.1upstream/5.8.1
Diffstat (limited to 'runtime/queue.c')
-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 50ae307..88e01a7 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); |