diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-03-12 11:32:53 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-03-12 11:32:53 +0100 |
| commit | 07e296703b1f018a847496269432ea778d97b752 (patch) | |
| tree | cbfe47deb0f4fdaa75634ed9fa869a04ba9d6495 /runtime/queue.c | |
| parent | 283ec2d6e8c4c037ee789759ddf6efecf570fff1 (diff) | |
| parent | bb74c4485a5fcb938645ca513f7b592aceff1c7f (diff) | |
| download | rsyslog-07e296703b1f018a847496269432ea778d97b752.tar.gz rsyslog-07e296703b1f018a847496269432ea778d97b752.tar.bz2 rsyslog-07e296703b1f018a847496269432ea778d97b752.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
action.c
queue.c (some code moved from action.c --> queue.c)
Diffstat (limited to 'runtime/queue.c')
| -rw-r--r-- | runtime/queue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/queue.c b/runtime/queue.c index bb9ea060..09ba7e67 100644 --- a/runtime/queue.c +++ b/runtime/queue.c @@ -1389,7 +1389,7 @@ qqueueSetDefaultsActionQueue(qqueue_t *pThis) pThis->iDeqBatchSize = 128; /* default batch size */ pThis->iHighWtrMrk = 800; /* high water mark for disk-assisted queues */ pThis->iLowWtrMrk = 200; /* low water mark for disk-assisted queues */ - pThis->iDiscardMrk = 9800; /* begin to discard messages */ + pThis->iDiscardMrk = 980; /* begin to discard messages */ pThis->iDiscardSeverity = 8; /* turn off */ pThis->iNumWorkerThreads = 1; /* number of worker threads for the mm queue above */ pThis->iMaxFileSize = 1024*1024; |