diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-09 17:57:46 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-09 17:57:46 +0100 |
| commit | 7916735ba6890f67d49077975b0d635dc9931380 (patch) | |
| tree | 7649ac35962e3c6382d7d1bee6eb9d44dd16303d | |
| parent | 9e0426da5fae3f565e44411ed8b9796acc81040d (diff) | |
| download | rsyslog-7916735ba6890f67d49077975b0d635dc9931380.tar.gz rsyslog-7916735ba6890f67d49077975b0d635dc9931380.tar.xz rsyslog-7916735ba6890f67d49077975b0d635dc9931380.zip | |
retain old $OMFileFlushOnTXEnd semantics
required because due to bug the default was actually different than
specified (or better said: spec was inconsistent in doc as well).
| -rw-r--r-- | doc/rsyslog_conf_global.html | 4 | ||||
| -rw-r--r-- | tools/omfile.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/rsyslog_conf_global.html b/doc/rsyslog_conf_global.html index 50d83a50..e7897f90 100644 --- a/doc/rsyslog_conf_global.html +++ b/doc/rsyslog_conf_global.html @@ -211,9 +211,9 @@ supported in order to be compliant to the upcoming new syslog RFC series. of the output file. The higher the number, the better the compression, but also the more CPU is required for zipping.</li> <li><b>$OMFileIOBufferSize</b> <size_nbr>, default 4k, size of the buffer used to writing output data. The larger the buffer, the potentially better performance is. The default of 4k is quite conservative, it is useful to go up to 64k, and 128K if you used gzip compression (then, even higher sizes may make sense)</li> -<li><b>$OMFileFlushOnTXEnd</b> <[<b>on</b>/off]>, default on. Omfile has the +<li><b>$OMFileFlushOnTXEnd</b> <[on/<b>off</b>]>, default ff. Omfile has the capability to -writes output using a buffered writer. Disk writes are only done when the buffer is +write output using a buffered writer. Disk writes are only done when the buffer is full. So if an error happens during that write, data is potentially lost. In cases where this is unacceptable, set $OMFileFlushOnTXEnd to on. Then, data is written at the end of each transaction (for pre-v5 this means after <b>each</b> log message) and the usual diff --git a/tools/omfile.c b/tools/omfile.c index 9b8f8e37..8fbf8fea 100644 --- a/tools/omfile.c +++ b/tools/omfile.c @@ -99,7 +99,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 = 1;/* flush write buffers when transaction has ended? */ +static bool bFlushOnTXEnd = 0;/* 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? */ uchar *pszFileDfltTplName = NULL; /* name of the default template to use */ @@ -749,7 +749,7 @@ static rsRetVal resetConfigVariables(uchar __attribute__((unused)) *pp, void __a bCreateDirs = 1; bEnableSync = 0; iZipLevel = 0; - bFlushOnTXEnd = 1; + bFlushOnTXEnd = 0; iIOBufSize = IOBUF_DFLT_SIZE; iFlushInterval = FLUSH_INTRVL_DFLT; if(pszFileDfltTplName != NULL) { |