Author: markt Date: Mon May 21 19:00:00 2018 New Revision: 1831985 URL: http://svn.apache.org/viewvc?rev=1831985&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62395 Clarify the meaning of the connector attribute minSpareThreads in the documentation web application.
Modified: tomcat/trunk/webapps/docs/changelog.xml tomcat/trunk/webapps/docs/config/ajp.xml tomcat/trunk/webapps/docs/config/executor.xml tomcat/trunk/webapps/docs/config/http.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1831985&r1=1831984&r2=1831985&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Mon May 21 19:00:00 2018 @@ -181,6 +181,15 @@ </update> </changelog> </subsection> + <subsection name="Web applications"> + <changlog> + <fix> + <bug>62395</bug>: Clarify the meaning of the connector attribute + <code>minSpareThreads</code> in the documentation web application. + (markt) + </fix> + </changlog> + </subsection> <subsection name="Tribes"> <changelog> <fix> Modified: tomcat/trunk/webapps/docs/config/ajp.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/ajp.xml?rev=1831985&r1=1831984&r2=1831985&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/config/ajp.xml (original) +++ tomcat/trunk/webapps/docs/config/ajp.xml Mon May 21 19:00:00 2018 @@ -405,13 +405,14 @@ </attribute> <attribute name="minSpareThreads" required="false"> - <p>The minimum number of threads always kept running. If not specified, - the default of <code>10</code> is used. If an executor is associated - with this connector, this attribute is ignored as the connector will - execute tasks using the executor rather than an internal thread pool. Note - that if an executor is configured any value set for this attribute will be - recorded correctly but it will be reported (e.g. via JMX) as - <code>-1</code> to make clear that it is not used.</p> + <p>The minimum number of threads always kept running. This includes both + active and idle threads. If not specified, the default of <code>10</code> + is used. If an executor is associated with this connector, this attribute + is ignored as the connector will execute tasks using the executor rather + than an internal thread pool. Note that if an executor is configured any + value set for this attribute will be recorded correctly but it will be + reported (e.g. via JMX) as <code>-1</code> to make clear that it is not + used.</p> </attribute> <attribute name="packetSize" required="false"> Modified: tomcat/trunk/webapps/docs/config/executor.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/executor.xml?rev=1831985&r1=1831984&r2=1831985&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/config/executor.xml (original) +++ tomcat/trunk/webapps/docs/config/executor.xml Mon May 21 19:00:00 2018 @@ -97,7 +97,7 @@ <p>(int) The max number of active threads in this pool, default is <code>200</code></p> </attribute> <attribute name="minSpareThreads" required="false"> - <p>(int) The minimum number of threads always kept alive, default is <code>25</code></p> + <p>(int) The minimum number of threads (idle and active) always kept alive, default is <code>25</code></p> </attribute> <attribute name="maxIdleTime" required="false"> <p>(int) The number of milliseconds before an idle thread shutsdown, unless the number of active threads are less Modified: tomcat/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1831985&r1=1831984&r2=1831985&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/config/http.xml (original) +++ tomcat/trunk/webapps/docs/config/http.xml Mon May 21 19:00:00 2018 @@ -522,13 +522,14 @@ </attribute> <attribute name="minSpareThreads" required="false"> - <p>The minimum number of threads always kept running. If not specified, - the default of <code>10</code> is used. If an executor is associated - with this connector, this attribute is ignored as the connector will - execute tasks using the executor rather than an internal thread pool. Note - that if an executor is configured any value set for this attribute will be - recorded correctly but it will be reported (e.g. via JMX) as - <code>-1</code> to make clear that it is not used.</p> + <p>The minimum number of threads always kept running. This includes both + active and idle threads. If not specified, the default of <code>10</code> + is used. If an executor is associated with this connector, this attribute + is ignored as the connector will execute tasks using the executor rather + than an internal thread pool. Note that if an executor is configured any + value set for this attribute will be recorded correctly but it will be + reported (e.g. via JMX) as <code>-1</code> to make clear that it is not + used.</p> </attribute> <attribute name="noCompressionUserAgents" required="false"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org