diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-07 10:56:01 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-07 10:56:01 +0100 |
| commit | 48c712ce7eed7e378be7be83e5d39c5e849fb126 (patch) | |
| tree | 40455a438307a6f8b6a1cad97d99d0e1ccc4bbc6 | |
| parent | 0a0f68c6fe93519e718d4d10c6cf47a0b3a9b890 (diff) | |
| parent | f666ca7e2ba46d032b0990f3456b5d39dce803fa (diff) | |
| download | rsyslog-48c712ce7eed7e378be7be83e5d39c5e849fb126.tar.gz rsyslog-48c712ce7eed7e378be7be83e5d39c5e849fb126.tar.bz2 rsyslog-48c712ce7eed7e378be7be83e5d39c5e849fb126.zip | |
Merge branch 'master' into master-newwtipool
| -rw-r--r-- | runtime/queue.c | 5 | ||||
| -rwxr-xr-x | tests/daqueue-persist.sh | 1 | ||||
| -rwxr-xr-x | tests/diskqueue.sh | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/runtime/queue.c b/runtime/queue.c index 30269152..30516876 100644 --- a/runtime/queue.c +++ b/runtime/queue.c @@ -2106,7 +2106,8 @@ qqueueStart(qqueue_t *pThis) /* this is the ConstructionFinalizer */ break; } - if(pThis->iMaxQueueSize < 100) { + if(pThis->iMaxQueueSize < 100 + && (pThis->qType == QUEUETYPE_LINKEDLIST || pThis->qType == QUEUETYPE_FIXED_ARRAY)) { errmsg.LogError(0, RS_RET_OK_WARN, "Note: queue.size=\"%d\" is very " "low and can lead to unpredictable results. See also " "http://www.rsyslog.com/lower-bound-for-queue-sizes/", @@ -2122,7 +2123,7 @@ qqueueStart(qqueue_t *pThis) /* this is the ConstructionFinalizer */ if(pThis->iLightDlyMrk == -1 || pThis->iLightDlyMrk > pThis->iMaxQueueSize) pThis->iLightDlyMrk = pThis->iMaxQueueSize - (pThis->iMaxQueueSize / 100) * 30; /* default 70% */ - if(pThis->iDeqBatchSize > pThis->iMaxQueueSize) + if(pThis->iMaxQueueSize > 0 && pThis->iDeqBatchSize > pThis->iMaxQueueSize) pThis->iDeqBatchSize = pThis->iMaxQueueSize; /* finalize some initializations that could not yet be done because it is diff --git a/tests/daqueue-persist.sh b/tests/daqueue-persist.sh index feb2a347..0781a7dc 100755 --- a/tests/daqueue-persist.sh +++ b/tests/daqueue-persist.sh @@ -2,6 +2,7 @@ # to carry out multiple tests with different queue modes # added 2009-05-27 by Rgerhards # This file is part of the rsyslog project, released under GPLv3 +echo =============================================================================== echo \[daqueue-persist.sh\]: test data persisting at shutdown source $srcdir/daqueue-persist-drvr.sh LinkedList source $srcdir/daqueue-persist-drvr.sh FixedArray diff --git a/tests/diskqueue.sh b/tests/diskqueue.sh index b871e9eb..853a836a 100755 --- a/tests/diskqueue.sh +++ b/tests/diskqueue.sh @@ -5,6 +5,7 @@ # added 2009-04-17 by Rgerhards # This file is part of the rsyslog project, released under GPLv3 # uncomment for debugging support: +echo =============================================================================== echo \[diskqueue.sh\]: testing queue disk-only mode # uncomment for debugging support: #export RSYSLOG_DEBUG="debug nostdout noprintmutexaction" |