You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by gr...@apache.org on 2005/12/12 09:06:15 UTC
svn commit: r356207 - in /geronimo/trunk: configs/jetty/src/plan/plan.xml
modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebConnector.java
modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java
Author: gregw
Date: Mon Dec 12 00:06:11 2005
New Revision: 356207
URL: http://svn.apache.org/viewcvs?rev=356207&view=rev
Log:
merged 1.0 changes for low threads attributes
Modified:
geronimo/trunk/configs/jetty/src/plan/plan.xml
geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebConnector.java
geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java
Modified: geronimo/trunk/configs/jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jetty/src/plan/plan.xml?rev=356207&r1=356206&r2=356207&view=diff
==============================================================================
--- geronimo/trunk/configs/jetty/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/jetty/src/plan/plan.xml Mon Dec 12 00:06:11 2005
@@ -70,8 +70,11 @@
<reference name="JettyContainer">
<name>JettyWebContainer</name>
</reference>
- <attribute name="maxThreads">50</attribute>
+ <attribute name="maxThreads">150</attribute>
<attribute name="minThreads">10</attribute>
+ <attribute name="lowThreads">25</attribute>
+ <attribute name="maxIdleTimeMs">30000</attribute>
+ <attribute name="lowThreadsMaxIdleTimeMs">800</attribute>
</gbean>
<gbean name="JettyAJP13Connector" class="org.apache.geronimo.jetty.connector.AJP13Connector">
@@ -94,8 +97,8 @@
<attribute name="clientAuthRequired">false</attribute>
<attribute name="algorithm">Default</attribute>
<attribute name="secureProtocol">TLS</attribute>
- <attribute name="maxThreads">50</attribute>
- <attribute name="minThreads">10</attribute>
+ <attribute name="maxThreads">150</attribute>
+ <attribute name="minThreads">25</attribute>
<reference name="JettyContainer">
<name>JettyWebContainer</name>
</reference>
Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebConnector.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebConnector.java?rev=356207&r1=356206&r2=356207&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebConnector.java (original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebConnector.java Mon Dec 12 00:06:11 2005
@@ -42,4 +42,16 @@
public int getIdlethreads();
public String getDefaultScheme();
+
+ public void setMaxIdleTimeMs(int max);
+
+ public int getMaxIdleTimeMs();
+
+ public void setLowThreadsMaxIdleTimeMs(int max);
+
+ public int getLowThreadsMaxIdleTimeMs();
+
+ public void setLowThreads(int lowThreads);
+
+ public int getLowThreads();
}
Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java?rev=356207&r1=356206&r2=356207&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java (original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java Mon Dec 12 00:06:11 2005
@@ -123,6 +123,36 @@
return ((ThreadedServer)listener).getMaxThreads();
}
+ public void setMaxIdleTimeMs(int max) {
+ ((ThreadedServer)listener).setMaxIdleTimeMs(max);
+ }
+
+ public int getMaxIdleTimeMs() {
+ return ((ThreadedServer)listener).getMaxIdleTimeMs();
+ }
+
+ public void setLowThreadsMaxIdleTimeMs(int max) {
+ if (listener instanceof SocketListener)
+ ((SocketListener)listener).setLowResourcePersistTimeMs(max);
+ }
+
+ public int getLowThreadsMaxIdleTimeMs() {
+ if (listener instanceof SocketListener)
+ return ((SocketListener)listener).getLowResourcePersistTimeMs();
+ return -1;
+ }
+
+ public void setLowThreads(int lowThreads) {
+ if (listener instanceof SocketListener)
+ ((SocketListener)listener).setLowResources(lowThreads);
+ }
+
+ public int getLowThreads() {
+ if (listener instanceof SocketListener)
+ return ((SocketListener)listener).getLowResources();
+ return -1;
+ }
+
public int getThreads() {
return ((ThreadedServer)listener).getThreads();
}
@@ -233,7 +263,7 @@
static {
GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("Jetty HTTP Connector", JettyConnector.class);
infoFactory.addReference(CONNECTOR_CONTAINER_REFERENCE, JettyContainer.class, NameFactory.GERONIMO_SERVICE);
- infoFactory.addInterface(JettyWebConnector.class, new String[]{"host", "port", "minThreads","maxThreads","bufferSizeBytes","acceptQueueSize","lingerMillis","tcpNoDelay","redirectPort","connectUrl",},
+ infoFactory.addInterface(JettyWebConnector.class, new String[]{"host", "port", "minThreads","maxThreads","bufferSizeBytes","acceptQueueSize","lingerMillis","tcpNoDelay","redirectPort","connectUrl","maxIdleTimeMs","lowThreads","lowThreadsMaxIdleTimeMs",},
new String[]{"host", "port", "redirectPort"});
infoFactory.setConstructor(new String[] {"JettyContainer"});
GBEAN_INFO = infoFactory.getBeanInfo();