geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1028322 - in /geronimo/server/branches/2.2/plugins/jetty7/jetty7: pom.xml src/main/plan/plan.xml
Date Thu, 28 Oct 2010 14:34:17 GMT
Author: genspring
Date: Thu Oct 28 14:34:16 2010
New Revision: 1028322

URL: http://svn.apache.org/viewvc?rev=1028322&view=rev
Log:
GERONIMO-5668 Use fewer acceptor threads for Jetty, patch from 	Trygve Sanne Hardersen.

Modified:
    geronimo/server/branches/2.2/plugins/jetty7/jetty7/pom.xml
    geronimo/server/branches/2.2/plugins/jetty7/jetty7/src/main/plan/plan.xml

Modified: geronimo/server/branches/2.2/plugins/jetty7/jetty7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/jetty7/jetty7/pom.xml?rev=1028322&r1=1028321&r2=1028322&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/jetty7/jetty7/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/jetty7/jetty7/pom.xml Thu Oct 28 14:34:16 2010
@@ -132,15 +132,21 @@
                                     <attribute name="host">#{ServerHostname}</attribute>
                                     <attribute name="port">#{HTTPPort + PortOffset}</attribute>
                                     <attribute name="redirectPort">#{HTTPSPortPrimary
+ PortOffset}</attribute>
+                                    <attribute name="maxThreads">#{webAcceptorThreads}</attribute>
+                                    <attribute name="acceptQueueSize">#{webAcceptorQueueSize}</attribute>
                                 </gbean>
                                 <gbean name="JettyAJP13Connector">
                                     <attribute name="host">#{ServerHostname}</attribute>
                                     <attribute name="port">#{AJPPort + PortOffset}</attribute>
                                     <attribute name="redirectPort">#{HTTPSPortPrimary
+ PortOffset}</attribute>
+                                    <attribute name="maxThreads">#{webAcceptorThreads}</attribute>
+                                    <attribute name="acceptQueueSize">#{webAcceptorQueueSize}</attribute>
                                 </gbean>
                                 <gbean name="JettySSLConnector">
                                     <attribute name="host">#{ServerHostname}</attribute>
                                     <attribute name="port">#{HTTPSPort + PortOffset}</attribute>
+                                    <attribute name="maxThreads">#{webAcceptorThreads}</attribute>
+                                    <attribute name="acceptQueueSize">#{webAcceptorQueueSize}</attribute>
                                 </gbean>
                             </config-xml-content>
                             <config-substitution key="HTTPPort">8080</config-substitution>
@@ -149,6 +155,8 @@
                             <config-substitution key="ServerHostname">0.0.0.0</config-substitution>
                             <config-substitution key="webcontainer">JettyWebContainer</config-substitution>
                             <config-substitution key="webcontainerName">jetty7</config-substitution>
+                            <config-substitution key="webAcceptorThreads">2</config-substitution>
+                            <config-substitution key="webAcceptorQueueSize">50</config-substitution>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/branches/2.2/plugins/jetty7/jetty7/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/jetty7/jetty7/src/main/plan/plan.xml?rev=1028322&r1=1028321&r2=1028322&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/jetty7/jetty7/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.2/plugins/jetty7/jetty7/src/main/plan/plan.xml Thu Oct 28 14:34:16
2010
@@ -71,7 +71,8 @@
         <reference name="ThreadPool">
             <name>DefaultThreadPool</name>
         </reference>
-        <attribute name="maxThreads">50</attribute>
+        <attribute name="maxThreads">2</attribute>
+        <attribute name="acceptQueueSize">50</attribute>
     </gbean>
 
     <gbean name="JettyAJP13Connector" class="org.apache.geronimo.jetty7.connector.AJP13Connector">
@@ -83,7 +84,8 @@
         <reference name="ThreadPool">
             <name>DefaultThreadPool</name>
         </reference>
-        <attribute name="maxThreads">50</attribute>
+        <attribute name="maxThreads">2</attribute>
+        <attribute name="acceptQueueSize">50</attribute>
     </gbean>
 
     <!-- DONT USE THIS ONE -->
@@ -120,7 +122,8 @@
         <attribute name="clientAuthRequired">false</attribute>
         <attribute name="algorithm">Default</attribute>
         <attribute name="secureProtocol">TLS</attribute>
-        <attribute name="maxThreads">50</attribute>
+        <attribute name="maxThreads">2</attribute>
+        <attribute name="acceptQueueSize">50</attribute>
         <reference name="JettyContainer">
             <name>JettyWebContainer</name>
         </reference>



Mime
View raw message