diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-22 15:12:35 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-22 15:12:35 +0200 |
| commit | 651bee9cf55ca6aaea73e7921928bf6f9bd65404 (patch) | |
| tree | 8c3ce1b498e01839fe6ef0c6adb8cfbcb2f42bad /tools/omfile.c | |
| parent | b5f3387357ffa11e238ddfe0fa38af4fffba6081 (diff) | |
| parent | 3abf567d2b57014381eda49018a0e2c21fa1b853 (diff) | |
| download | rsyslog-651bee9cf55ca6aaea73e7921928bf6f9bd65404.tar.gz rsyslog-651bee9cf55ca6aaea73e7921928bf6f9bd65404.tar.bz2 rsyslog-651bee9cf55ca6aaea73e7921928bf6f9bd65404.zip | |
Merge branch 'omfile' into tmp
This was a complex manual merge, especially in action.c. So if
there occur some problems, this would be a good point to start
troubleshooting. I run a couple of tests before commiting and
they all went well.
Conflicts:
action.c
action.h
runtime/queue.c
runtime/queue.h
runtime/wti.c
runtime/wti.h
Diffstat (limited to 'tools/omfile.c')
| -rw-r--r-- | tools/omfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/omfile.c b/tools/omfile.c index 675d313e..b62d9c57 100644 --- a/tools/omfile.c +++ b/tools/omfile.c @@ -102,7 +102,7 @@ static uid_t dirGID; /* GID to be used for newly created directories */ static int bCreateDirs; /* 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 = 1;/* flush write buffers when transaction has ended? */ static int iIOBufSize = IOBUF_DFLT_SIZE; /* size of an io buffer */ static int iFlushInterval = FLUSH_INTRVL_DFLT; /* how often flush the output buffer on inactivity? */ static uchar *pszTplName = NULL; /* name of the default template to use */ @@ -715,7 +715,7 @@ static rsRetVal resetConfigVariables(uchar __attribute__((unused)) *pp, void __a bCreateDirs = 1; bEnableSync = 0; iZipLevel = 0; - bFlushOnTXEnd = 0; + bFlushOnTXEnd = 1; iIOBufSize = IOBUF_DFLT_SIZE; iFlushInterval = FLUSH_INTRVL_DFLT; if(pszTplName != NULL) { |