diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-20 16:23:00 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-20 16:23:00 +0100 |
| commit | e5e8e3b8153d09b8374b3f6f76a6c47dd9e1f0cc (patch) | |
| tree | d7a6569fdd776a3f91abccce98fd57aa5b8fc36e | |
| parent | 060187d21c0009f2fd7181980de3b38df9064024 (diff) | |
| parent | d7a0899203a911d7441f2d3a2efd908a7e50f8d9 (diff) | |
| download | rsyslog-e5e8e3b8153d09b8374b3f6f76a6c47dd9e1f0cc.tar.gz rsyslog-e5e8e3b8153d09b8374b3f6f76a6c47dd9e1f0cc.tar.bz2 rsyslog-e5e8e3b8153d09b8374b3f6f76a6c47dd9e1f0cc.zip | |
Merge branch 'master' into master-alternate-queue-mutex
| -rw-r--r-- | runtime/queue.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/runtime/queue.c b/runtime/queue.c index 63f2db74..5770eae9 100644 --- a/runtime/queue.c +++ b/runtime/queue.c @@ -2130,11 +2130,9 @@ qqueueStart(qqueue_t *pThis) /* this is the ConstructionFinalizer */ || pThis->iLowWtrMrk > pThis->iMaxQueueSize || pThis->iLowWtrMrk > pThis->iHighWtrMrk ) pThis->iLowWtrMrk = (pThis->iMaxQueueSize / 100) * 70; - if(pThis->iNumWorkerThreads > 1) { - if( pThis->iMinMsgsPerWrkr < 1 - || pThis->iMinMsgsPerWrkr > pThis->iMaxQueueSize ) - pThis->iMinMsgsPerWrkr = pThis->iMaxQueueSize / pThis->iNumWorkerThreads; - } + if( pThis->iMinMsgsPerWrkr < 1 + || pThis->iMinMsgsPerWrkr > pThis->iMaxQueueSize ) + pThis->iMinMsgsPerWrkr = pThis->iMaxQueueSize / pThis->iNumWorkerThreads; if(pThis->iFullDlyMrk == -1 || pThis->iFullDlyMrk > pThis->iMaxQueueSize) pThis->iFullDlyMrk = (pThis->iMaxQueueSize / 100) * 97; if(pThis->iLightDlyMrk == -1 || pThis->iLightDlyMrk > pThis->iMaxQueueSize) |