[jbossweb-commits] JBossWeb SVN: r818 - in trunk: java/org/apache/tomcat/util/net/res and 1 other directories.
Author: remy.maucherat(a)jboss.com
Date: 2008-10-27 12:54:26 -0400 (Mon, 27 Oct 2008)
New Revision: 818
Modified:
trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
trunk/webapps/docs/changelog.xml
Log:
- Add info messages when maxThreads is reached.
Modified: trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
===================================================================
--- trunk/java/org/apache/tomcat/util/net/AprEndpoint.java 2008-10-27 15:01:23 UTC (rev
817)
+++ trunk/java/org/apache/tomcat/util/net/AprEndpoint.java 2008-10-27 16:54:26 UTC (rev
818)
@@ -902,6 +902,11 @@
}
if ((maxThreads > 0) && (curThreads < maxThreads)) {
curThreadsBusy++;
+ if (curThreadsBusy == maxThreads) {
+ log.info(sm.getString("endpoint.info.maxThreads",
+ Integer.toString(maxThreads), address,
+ Integer.toString(port)));
+ }
return (newWorkerThread());
} else {
if (maxThreads < 0) {
Modified: trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
===================================================================
--- trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java 2008-10-27 15:01:23 UTC (rev
817)
+++ trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java 2008-10-27 16:54:26 UTC (rev
818)
@@ -662,6 +662,11 @@
}
if ((maxThreads > 0) && (curThreads < maxThreads)) {
curThreadsBusy++;
+ if (curThreadsBusy == maxThreads) {
+ log.info(sm.getString("endpoint.info.maxThreads",
+ Integer.toString(maxThreads), address,
+ Integer.toString(port)));
+ }
return (newWorkerThread());
} else {
if (maxThreads < 0) {
Modified: trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
===================================================================
--- trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties 2008-10-27 15:01:23
UTC (rev 817)
+++ trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties 2008-10-27 16:54:26
UTC (rev 818)
@@ -1,6 +1,7 @@
# net resources
endpoint.err.fatal=Endpoint {0} shutdown due to exception: {1}
endpoint.err.nonfatal=Endpoint {0} ignored exception: {1}
+endpoint.info.maxThreads=Maximum number of threads ({0}) created for connector with
address {1} and port {2}
endpoint.warn.reinit=Reinitializing ServerSocket
endpoint.warn.restart=Restarting endpoint
endpoint.warn.security=Endpoint {0} security exception: {1}
@@ -22,5 +23,5 @@
endpoint.maintain.error=Error processing timeouts
endpoint.process.fail=Error allocating socket processor
endpoint.sendfile.error=Unexpected sendfile error
-endpoint.sendfile.addfail=Sednfile failure: [{0}] {1}
+endpoint.sendfile.addfail=Sendfile failure: [{0}] {1}
endpoint.sendfile.nosupport=Disabling sendfile, since either the APR version or the
system doesn't support it
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2008-10-27 15:01:23 UTC (rev 817)
+++ trunk/webapps/docs/changelog.xml 2008-10-27 16:54:26 UTC (rev 818)
@@ -94,6 +94,9 @@
<fix>
<bug>46077</bug>: Add configuration for deferAccept flag. (remm)
</fix>
+ <fix>
+ Add maxThreads warning. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">