diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-06 09:17:27 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-06 09:17:27 +0200 |
| commit | ee403c2ad745039add6cd34ec1e9a55aa9d51160 (patch) | |
| tree | 0d5a6f5463d91a7fa160532e2f3e094590ff4506 /doc | |
| parent | 06633d3fac69a3d380b36ce728a6f2278561b4bb (diff) | |
| parent | ffdc33e3f178ad85ba5c2c9f7fcee98b743e9d5e (diff) | |
| download | rsyslog-ee403c2ad745039add6cd34ec1e9a55aa9d51160.tar.gz rsyslog-ee403c2ad745039add6cd34ec1e9a55aa9d51160.tar.xz rsyslog-ee403c2ad745039add6cd34ec1e9a55aa9d51160.zip | |
Merge branch 'v5-stable-imfile-batches' into v5-devel
Conflicts:
ChangeLog
configure.ac
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/imfile.html | 11 | ||||
| -rw-r--r-- | doc/manual.html | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/doc/imfile.html b/doc/imfile.html index 60726ceb..60bbbeea 100644 --- a/doc/imfile.html +++ b/doc/imfile.html @@ -98,9 +98,16 @@ performance, especially when set to a low value. Frequently writing the state file is very time consuming. <li><b>$InputFileReadMode</b> [mode]</b><br> Available in 5.7.5+ +<li><b>$InputFileMaxLinesAtOnce</b> [number]</b><br> +Available in 5.9.0+ <br> -Mode to be used when reading lines. 0 (the default) means that each line is forwarded -as its own log message. +This is useful if multiple files need to be monitored. If set to 0, each file +will be fully processed and then processing switches to the next file +(this was the default in previous versions). If it is set, a maximum of +[number] lines is processed in sequence for each file, and then the file is +switched. This provides a kind of mutiplexing the load of multiple files and +probably leads to a more natural distribution of events when multiple busy files +are monitored. The default is 10240. <li>$InputFileBindRuleset <ruleset><br> Available in 5.7.5+, 6.1.5+ Binds the listener to a specific <a href="multi_ruleset.html">ruleset</a>.</li> diff --git a/doc/manual.html b/doc/manual.html index e1f0ebf9..5c656752 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -19,7 +19,7 @@ rsyslog support</a> available directly from the source!</p> <p><b>Please visit the <a href="http://www.rsyslog.com/sponsors">rsyslog sponsor's page</a> to honor the project sponsors or become one yourself!</b> We are very grateful for any help towards the project goals.</p> -<p><b>This documentation is for version 5.8.0 (stable branch) of rsyslog.</b> +<p><b>This documentation is for version 5.8.1 (stable branch) of rsyslog.</b> Visit the <i><a href="http://www.rsyslog.com/status">rsyslog status page</a></i></b> to obtain current version information and project status. </p><p><b>If you like rsyslog, you might |