diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-07 14:40:55 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-07 14:40:55 +0200 |
| commit | 5ef852f4a3f030f61254a963b0d2dca290933e3c (patch) | |
| tree | a7d52e313863b7c333a9b8326d8e873c57dd17f5 | |
| parent | 7db6ffbce3e2a709e77ff05782f703ec112ed84b (diff) | |
| parent | e2ceb7247cbd9dff1bfb0efe22d6bc68e70a3fd8 (diff) | |
| download | rsyslog-5ef852f4a3f030f61254a963b0d2dca290933e3c.tar.gz rsyslog-5ef852f4a3f030f61254a963b0d2dca290933e3c.tar.xz rsyslog-5ef852f4a3f030f61254a963b0d2dca290933e3c.zip | |
Merge branch 'v4-stable' into v4-stable-solaris
Conflicts:
ChangeLog
tests/Makefile.am
tests/tcpflood.c
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | tools/omfile.c | 5 |
2 files changed, 9 insertions, 4 deletions
@@ -1,6 +1,12 @@ +--------------------------------------------------------------------------- +Version 4.6.3 [v4-stable] (rgerhards), 2010-03-?? - improvded testbench - added test with truly random data received via syslog to test robustness +- bugfix: default for $OMFileFlushOnTXEnd was wrong ("off"). + This, in default mode, caused buffered writing to be used, what + means that it looked like no output were written or partial + lines. Thanks to Michael Biebl for pointing out this bug. - bugfix: testbench failed when not executed in UTC+1 timezone accidently, the time zone information was kept inside some to-be-checked-for responses @@ -10,8 +16,6 @@ integrated. - bugfix: the T/P/E config size specifiers did not work properly under all 32-bit platforms ---------------------------------------------------------------------------- -Version 4.6.3 [v4-stable] (rgerhards), 2010-03-?? - bugfix: local unix system log socket was deleted even when it was not configured --------------------------------------------------------------------------- diff --git a/tools/omfile.c b/tools/omfile.c index 0f476000..24de052c 100644 --- a/tools/omfile.c +++ b/tools/omfile.c @@ -87,6 +87,7 @@ typedef struct s_dynaFileCacheEntry dynaFileCacheEntry; #define IOBUF_DFLT_SIZE 1024 /* default size for io buffers */ #define FLUSH_INTRVL_DFLT 1 /* default buffer flush interval (in seconds) */ #define USE_ASYNCWRITER_DFLT 0 /* default buffer use async writer */ +#define FLUSHONTX_DFLT 1 /* default for flush on TX end */ /* globals for default values */ static int iDynaFileCacheSize = 10; /* max cache for dynamic files */ @@ -100,7 +101,7 @@ static uid_t dirGID; /* GID to be used for newly created directories */ static int bCreateDirs = 1;/* auto-create directories for dynaFiles: 0 - no, 1 - yes */ static int bEnableSync = 0;/* enable syncing of files (no dash in front of pathname in conf): 0 - no, 1 - yes */ static int iZipLevel = 0; /* zip compression mode (0..9 as usual) */ -static bool bFlushOnTXEnd = 0;/* flush write buffers when transaction has ended? */ +static bool bFlushOnTXEnd = FLUSHONTX_DFLT;/* flush write buffers when transaction has ended? */ static int64 iIOBufSize = IOBUF_DFLT_SIZE; /* size of an io buffer */ static int iFlushInterval = FLUSH_INTRVL_DFLT; /* how often flush the output buffer on inactivity? */ static int bUseAsyncWriter = USE_ASYNCWRITER_DFLT; /* should we enable asynchronous writing? */ @@ -764,7 +765,7 @@ static rsRetVal resetConfigVariables(uchar __attribute__((unused)) *pp, void __a bCreateDirs = 1; bEnableSync = 0; iZipLevel = 0; - bFlushOnTXEnd = 0; + bFlushOnTXEnd = FLUSHONTX_DFLT; iIOBufSize = IOBUF_DFLT_SIZE; iFlushInterval = FLUSH_INTRVL_DFLT; bUseAsyncWriter = USE_ASYNCWRITER_DFLT; |