diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-03-22 09:33:33 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-03-22 09:33:33 +0100 |
| commit | 223439934c20f38bc00ec5287124737932d33ddb (patch) | |
| tree | 83f1b2b82271574ddd503ab1c43049b86817f839 /runtime/queue.c | |
| parent | 785e0c3c8b00614b6f780f902442025f4558a160 (diff) | |
| parent | 906ed9df906fe3a52b042929130e6fc9a00b53a8 (diff) | |
| download | rsyslog-223439934c20f38bc00ec5287124737932d33ddb.tar.gz rsyslog-223439934c20f38bc00ec5287124737932d33ddb.tar.bz2 rsyslog-223439934c20f38bc00ec5287124737932d33ddb.zip | |
Merge branch 'master' into master-gt
Conflicts:
configure.ac
runtime/rsyslog.h
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 6df1c95e..4c8d3ac5 100644 --- a/runtime/queue.c +++ b/runtime/queue.c @@ -1356,7 +1356,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; |