diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-07-05 15:14:36 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-07-05 15:14:36 +0200 |
| commit | d9a82205ff0b42a84875d45c809e8b7aded7eb2b (patch) | |
| tree | 861b66fbde7b876413c00e449315e2fbd81b07a5 /tools/omfile.c | |
| parent | 149bab9cd1eb77c0708369d0a56903db90ab9d5f (diff) | |
| parent | 9de526eccd85324f8cff4968ac6b17fa66648c2b (diff) | |
| download | rsyslog-d9a82205ff0b42a84875d45c809e8b7aded7eb2b.tar.gz rsyslog-d9a82205ff0b42a84875d45c809e8b7aded7eb2b.tar.xz rsyslog-d9a82205ff0b42a84875d45c809e8b7aded7eb2b.zip | |
Merge branch 'v4-stable' into tmp
Conflicts:
ChangeLog
Makefile.am
tests/Makefile.am
Diffstat (limited to 'tools/omfile.c')
| -rw-r--r-- | tools/omfile.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/omfile.c b/tools/omfile.c index 1ade3132..d9dce4f9 100644 --- a/tools/omfile.c +++ b/tools/omfile.c @@ -109,6 +109,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 */ #define DFLT_bForceChown 0 /* globals for default values */ @@ -124,7 +125,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? */ @@ -822,7 +823,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; |