Author: markt
Date: Thu Sep 30 21:47:46 2010
New Revision: 1003304

URL: http://svn.apache.org/viewvc?rev=1003304&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49856
Add an executorName attribute to Connectors so it is possible to trace 
ThreadPool to Connector to Executor via JMX.

Modified:
    tomcat/trunk/java/org/apache/catalina/connector/Connector.java
    tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1003304&r1=1003303&r2=1003304&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Thu Sep 30 
21:47:46 2010
@@ -774,6 +774,15 @@ public class Connector extends Lifecycle
         return useIPVHosts;
     }
 
+
+    public String getExecutorName() {
+        Object obj = protocolHandler.getExecutor();
+        if (obj instanceof org.apache.catalina.Executor) {
+            return ((org.apache.catalina.Executor) obj).getName();
+        }
+        return "Internal";
+    }
+
     // --------------------------------------------------------- Public Methods
 
 

Modified: tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml?rev=1003304&r1=1003303&r2=1003304&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml Thu 
Sep 30 21:47:46 2010
@@ -71,6 +71,11 @@
           description="The 'enable DNS lookups' flag for this Connector"
                  type="boolean"/>
 
+    <attribute   name="executorName"
+          description="The name of the executor - if any - associated with 
this Connector"
+                 type="java.lang.String"
+            writeable="false"/>
+
     <!-- Common -->
     <attribute   name="keepAliveTimeout"
           description="The number of seconds Tomcat will wait for a subsequent 
request before closing the connection"

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1003304&r1=1003303&r2=1003304&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Sep 30 21:47:46 2010
@@ -138,6 +138,11 @@
         and Tomcat 7. (markt)
       </fix>
       <fix>
+        <bug>49856</bug>: Add an executorName attribute to Connectors so it is
+        possible to trace ThreadPool to Connector to Executor via the JMX
+        interface. (markt)
+      </fix>
+      <fix>
         <bug>49865</bug>: Tomcat failed to start if catalina.properties was not
         present. (markt)
       </fix>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to