diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-19 15:13:33 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-19 15:13:33 +0200 |
| commit | ada87cbaefecff9d32f3d008876f2eec59335ded (patch) | |
| tree | c52339b2e2c2cbfc7a7152bf1cc65912b46932c2 /doc | |
| parent | 11ab3c800043b036132b0fc96d20bcba637a72b6 (diff) | |
| parent | 9039fad4019cb9a0f96eb296835476841b453dd3 (diff) | |
| download | rsyslog-ada87cbaefecff9d32f3d008876f2eec59335ded.tar.gz rsyslog-ada87cbaefecff9d32f3d008876f2eec59335ded.tar.xz rsyslog-ada87cbaefecff9d32f3d008876f2eec59335ded.zip | |
Merge branch 'v4-devel' into master
Conflicts:
ChangeLog
Makefile.am
configure.ac
doc/manual.html
runtime/debug.c
runtime/rsyslog.h
tests/Makefile.am
tests/diag.sh
tests/nettester.c
tools/syslogd.c
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/rsyslog_conf_global.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/rsyslog_conf_global.html b/doc/rsyslog_conf_global.html index e86da969..2f905877 100644 --- a/doc/rsyslog_conf_global.html +++ b/doc/rsyslog_conf_global.html @@ -238,7 +238,7 @@ in that case by sending rsyslogd a HUP signal. 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> <[on/<b>off</b>]>, default ff. Omfile has the +<li><b>$OMFileFlushOnTXEnd</b> <[<b>on</b>/off]>, default on. Omfile has the capability to 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 @@ -246,7 +246,7 @@ this is unacceptable, set $OMFileFlushOnTXEnd to on. Then, data is written at th of each transaction (for pre-v5 this means after <b>each</b> log message) and the usual error recovery thus can handle write errors without data loss. Note that this option severely reduces the effect of zip compression and should be switched to off -for that use case. Note that the default -off- is primarily an aid to preserve +for that use case. Note that the default -on- is primarily an aid to preserve the traditional syslogd behaviour.</li> <li><a href="rsconf1_omfileforcechown.html">$omfileForceChown</a> - force ownership change for all files</li> <li><b>$RepeatedMsgContainsOriginalMsg</b> [on/<b>off</b>] - "last message repeated n times" messages, if generated, |