diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-06-20 10:58:18 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-06-20 10:58:18 +0200 |
commit | 01782e19da3a0a134acfefc1ee48b46579d2e2ad (patch) | |
tree | 18fea9ed628bcdaea4bab4dd4973910c1220d909 | |
parent | 02d14adde43d00bb7fcf40a7c52500c0fb2e760c (diff) | |
parent | b57911b01893efabef8ad834dd67b1ea3ce9d4be (diff) | |
download | rsyslog-01782e19da3a0a134acfefc1ee48b46579d2e2ad.tar.gz rsyslog-01782e19da3a0a134acfefc1ee48b46579d2e2ad.tar.bz2 rsyslog-01782e19da3a0a134acfefc1ee48b46579d2e2ad.zip |
Merge branch 'v7-stable'
-rw-r--r-- | doc/imptcp.html | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/imptcp.html b/doc/imptcp.html index 3efcce27..f1a87fc9 100644 --- a/doc/imptcp.html +++ b/doc/imptcp.html @@ -31,7 +31,10 @@ globaly to all inputs defined by the module. Number of helper worker threads to process incoming messages. These threads are utilized to pull data off the network. On a busy system, additional helper threads (but not more than there are CPUs/Cores) can help improving -performance. The default value is two. +performance. The default value is two, which means there +is a default thread count of three (the main input thread plus two +helpers). +No more than 16 threads can be set (if tried to, rsyslog always resorts to 16). </ul> <p><b>Input Parameters</b>:</p> <p>These parameters can be used with the "input()" statement. They apply to the @@ -140,11 +143,8 @@ Equivalent to: Port </li> Equivalent to: Name </li> <li>$InputPTCPServerBindRuleset <name><br> Equivalent to: Ruleset </li> -<li>$InputPTCPHelperThreads <number><br> -Number of helper worker threads to process incoming messages. These -threads are utilized to pull data off the network. On a busy system, additional -helper threads (but not more than there are CPUs/Cores) can help improving -performance. The default value is two. +<li>$InputPTCPServerHelperThreads <number><br> +Equivalent to: threads </li> <li>$InputPTCPServerListenIP <name><br> Equivalent to: Address </li> </ul> @@ -164,7 +164,7 @@ $InputPTCPServerRun 514 <p><font size="2">This documentation is part of the <a href="http://www.rsyslog.com/">rsyslog</a> project.<br> -Copyright © 2010-2012 by <a href="http://www.gerhards.net/rainer">Rainer +Copyright © 2010-2013 by <a href="http://www.gerhards.net/rainer">Rainer Gerhards</a> and <a href="http://www.adiscon.com/">Adiscon</a>. Released under the GNU GPL version 3 or higher.</font></p> |