summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--action.c2
-rw-r--r--syslogd.c2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a967f4a7..1534f36b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,12 @@ Version 3.18.4 (rgerhards), 2008-09-??
- bugfix: error code -2025 was used for two different errors. queue full
is now -2074 and -2025 is unique again. (did cause no real problem
except for troubleshooting)
+- bugfix: default discard severity was incorrectly set to 4, which lead
+ to discard-on-queue-full to be enabled by default. That could cause
+ message loss where non was expected. The default has now been changed
+ to the correct value of 8, which disables the functionality. This
+ problem applied both to the main message queue and the action queues.
+ Thanks to Raoul Bhatia for pointing out this problem.
---------------------------------------------------------------------------
Version 3.18.3 (rgerhards), 2008-08-18
- bugfix: imfile could cause a segfault upon rsyslogd HUP and termination
diff --git a/action.c b/action.c
index 8b47f541..5de16b23 100644
--- a/action.c
+++ b/action.c
@@ -105,7 +105,7 @@ actionResetQueueParams(void)
iActionQHighWtrMark = 800; /* high water mark for disk-assisted queues */
iActionQLowWtrMark = 200; /* low water mark for disk-assisted queues */
iActionQDiscardMark = 9800; /* begin to discard messages */
- iActionQDiscardSeverity = 4; /* discard warning and above */
+ iActionQDiscardSeverity = 8; /* discard warning and above */
iActionQueueNumWorkers = 1; /* number of worker threads for the mm queue above */
iActionQueMaxFileSize = 1024*1024;
iActionQPersistUpdCnt = 0; /* persist queue info every n updates */
diff --git a/syslogd.c b/syslogd.c
index 26a15293..d90ead7f 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -399,7 +399,7 @@ static rsRetVal resetConfigVariables(uchar __attribute__((unused)) *pp, void __a
iMainMsgQHighWtrMark = 8000;
iMainMsgQLowWtrMark = 2000;
iMainMsgQDiscardMark = 9800;
- iMainMsgQDiscardSeverity = 4;
+ iMainMsgQDiscardSeverity = 8;
iMainMsgQueMaxFileSize = 1024 * 1024;
iMainMsgQueueNumWorkers = 1;
iMainMsgQPersistUpdCnt = 0;