summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-03-09 17:52:01 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-03-09 17:52:01 +0100
commit9e0426da5fae3f565e44411ed8b9796acc81040d (patch)
treec76a7911a11110ee10b2eb274f5c0083877746f7
parentd97ad63e218112d7cd3a390854b2918407804976 (diff)
downloadrsyslog-9e0426da5fae3f565e44411ed8b9796acc81040d.tar.gz
rsyslog-9e0426da5fae3f565e44411ed8b9796acc81040d.tar.xz
rsyslog-9e0426da5fae3f565e44411ed8b9796acc81040d.zip
bugfix: $omfileFlushOnTXEnd was turned on when set to off and vice versa
-rw-r--r--ChangeLog2
-rw-r--r--tools/omfile.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e9ccd5c7..321963dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
---------------------------------------------------------------------------
Version 4.6.2 [v4-stable] (rgerhards), 2010-03-??
+- bugfix: $omfileFlushOnTXEnd was turned on when set to off and vice
+ versa due to an invalid check
- added new property replacer option "date-rfc3164-buggyday" primarily
to ease migration from syslog-ng. See property replacer doc for
details. [backport from 5.5.3 because urgently needed by some]
diff --git a/tools/omfile.c b/tools/omfile.c
index eb56201c..9b8f8e37 100644
--- a/tools/omfile.c
+++ b/tools/omfile.c
@@ -413,7 +413,7 @@ prepareFile(instanceData *pData, uchar *newFileName)
* async processing, which is a real performance waste if we do not do buffered
* writes! -- rgerhards, 2009-07-06
*/
- if(!pData->bFlushOnTXEnd)
+ if(pData->bFlushOnTXEnd)
CHKiRet(strm.SetiFlushInterval(pData->pStrm, pData->iFlushInterval));
if(pData->pszSizeLimitCmd != NULL)
CHKiRet(strm.SetpszSizeLimitCmd(pData->pStrm, ustrdup(pData->pszSizeLimitCmd)));