summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-10-18 13:43:34 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-10-18 13:43:34 +0200
commitbea330746cd07ce08f9d5d062924bf2c5195d6ee (patch)
treece4b57a9bec9f21a054d99d4c2e594ba2bf330b6
parentf84c8c4e9637748bd3a6a985bd12afa6b50e9797 (diff)
downloadrsyslog-bea330746cd07ce08f9d5d062924bf2c5195d6ee.tar.gz
rsyslog-bea330746cd07ce08f9d5d062924bf2c5195d6ee.tar.xz
rsyslog-bea330746cd07ce08f9d5d062924bf2c5195d6ee.zip
bugfix: $OMFileFlushInterval period was doubled - now using correct value
-rw-r--r--ChangeLog1
-rw-r--r--runtime/stream.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3ff7cdaf..35de07e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
---------------------------------------------------------------------------
Version 5.8.6 [V5-stable] 2011-??-??
+- bugfix: $OMFileFlushInterval period was doubled - now using correct value
- bugfix: ActionQueue could malfunction due to index error
Thanks to Vlad Grigorescu for the patch
- bugfix: $ActionExecOnlyOnce interval did not work properly
diff --git a/runtime/stream.c b/runtime/stream.c
index 0238d25e..6b88d3f4 100644
--- a/runtime/stream.c
+++ b/runtime/stream.c
@@ -1036,7 +1036,7 @@ asyncWriterThread(void *pPtr)
continue; /* now we should have data */
}
bTimedOut = 0;
- timeoutComp(&t, pThis->iFlushInterval * 2000); /* *1000 millisconds */ // TODO: check the 2000?!?
+ timeoutComp(&t, pThis->iFlushInterval * 1000); /* *1000 millisconds */
if(pThis->bDoTimedWait) {
if(pthread_cond_timedwait(&pThis->notEmpty, &pThis->mut, &t) != 0) {
int err = errno;