rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-19 12:40:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3897 from rgerhards/daq-batch

Browse Source 
core queue bugfix: propagate batch size to DA queue
This commit is contained in:
Rainer Gerhards 2019-10-16 17:19:32 +02:00 committed by GitHub
commit e47124959a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/queue.c
View File

@ -485,6 +485,8 @@ StartDA(qqueue_t *pThis)
CHKiRet(qqueueSettoQShutdown(pThis->pqDA, pThis->toQShutdown));
CHKiRet(qqueueSetiHighWtrMrk(pThis->pqDA, 0));
CHKiRet(qqueueSetiDiscardMrk(pThis->pqDA, 0));
pThis->pqDA->iDeqBatchSize = pThis->iDeqBatchSize;
pThis->pqDA->iMinDeqBatchSize = pThis->iMinDeqBatchSize;
if(pThis->useCryprov) {
/* hand over cryprov to DA queue - in-mem queue does no longer need it
* and DA queue will be kept active from now on until termination.
@ -2301,8 +2303,6 @@ GetDeqBatchSize(qqueue_t *pThis, int *pVal)
DEFiRet;
assert(pVal != NULL);
*pVal = pThis->iDeqBatchSize;
if(pThis->pqParent != NULL) // TODO: check why we actually do this!
*pVal = 16;
RETiRet;
}