diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-11-25 17:43:51 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-11-25 17:43:51 +0100 |
commit | 44300ddcb2904105e2ecd56479bf396399dcab26 (patch) | |
tree | d8a1eef882e4edd784de0a41383d4c43c5b24fd6 /doc | |
parent | bd157a7d698f420ea3a9459fc90dd930c54a5e54 (diff) | |
parent | a3c81f500a4d952ce93162a730cadee8fbc8116b (diff) | |
download | rsyslog-44300ddcb2904105e2ecd56479bf396399dcab26.tar.gz rsyslog-44300ddcb2904105e2ecd56479bf396399dcab26.tar.xz rsyslog-44300ddcb2904105e2ecd56479bf396399dcab26.zip |
Merge branch 'v5-beta' into v5-devel
Conflicts:
ChangeLog
configure.ac
doc/imfile.html
plugins/imfile/imfile.c
runtime/rsyslog.h
Diffstat (limited to 'doc')
-rw-r--r-- | doc/imfile.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/imfile.html b/doc/imfile.html index 3687302b..f6b140a7 100644 --- a/doc/imfile.html +++ b/doc/imfile.html @@ -86,8 +86,8 @@ level may be needed. Even if you need quick response, 1 seconds should be well enough. Please note that imfile keeps reading files as long as there is any data in them. So a "polling sleep" will only happen when nothing is left to be processed.</li> -<li><b>$InputFilePollInterval</b> [lines]</b><br> -Available in 4.7.3+<br> +<li><b>$InputFilePersistStateInterval</b> [lines]</b><br> +Available in 4.7.3+, 5.6.2+<br> Specifies how often the state file shall be written when processing the input file. The default value is 0, which means a new state file is only written when the monitored files is being closed (end of rsyslogd execution). Any other |