Skip to content

Commit a5c361b

Browse files
authored
Remove long-deprecated handler count options (#294)
1 parent 80cfadd commit a5c361b

File tree

3 files changed

+0
-29
lines changed

3 files changed

+0
-29
lines changed

src/main/java/winstone/Launcher.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,6 @@ public Launcher(Map<String, String> args) throws IOException {
8585
this.args = args;
8686
this.controlPort =Option.CONTROL_PORT.get(args);
8787

88-
if( Option.HANDLER_COUNT_MAX.get( args, -1 )!=-1){
89-
Logger.log(Logger.WARNING, RESOURCES, Option.HANDLER_COUNT_MAX.name);
90-
}
91-
if( Option.HANDLER_COUNT_MAX_IDLE.get( args, -1 )!=-1){
92-
Logger.log(Logger.WARNING, RESOURCES, Option.HANDLER_COUNT_MAX_IDLE.name);
93-
}
94-
9588
// Check for java home
9689
List<URL> jars = new ArrayList<>();
9790
String defaultJavaHome = System.getProperty("java.home");

src/main/java/winstone/cmdline/Option.java

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -80,25 +80,6 @@ public static List<Option<?>> all(Class<?> clazz) {
8080

8181
public static final OBoolean USE_JMX=bool("useJmx",false);
8282

83-
/**
84-
* @deprecated NOT USED
85-
* How many requests do we handle concurrently?
86-
*
87-
* If the system gets really loaded, too many concurrent threads will create vicious cycles
88-
* and make everyone slow (or worst case choke every request by OOME), so better to err
89-
* on the conservative side (and have inbound connections wait in the queue)
90-
*/
91-
@Deprecated
92-
public static final OInt HANDLER_COUNT_MAX =integer("handlerCountMax",-1);
93-
94-
/**
95-
* @deprecated NOT USED
96-
* Leave this number of request handler threads in the pool even when they are idle.
97-
* Other threads are destroyed when they are idle to free up resources.
98-
*/
99-
@Deprecated
100-
public static final OInt HANDLER_COUNT_MAX_IDLE=integer("handlerCountMaxIdle",-1);
101-
10283
public static final OInt QTP_MAXTHREADS=integer("qtpMaxThreadsCount",-1);
10384
public static final OInt JETTY_ACCEPTORS=integer("jettyAcceptorsCount",-1);
10485
public static final OInt JETTY_SELECTORS=integer("jettySelectorsCount",0);

src/main/resources/winstone/LocalStrings.properties

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,3 @@ HttpsListener.KeyStoreNotFound=No SSL key store found at [#0]
137137
HttpsListener.ExcludeCiphers=Exclude Ciphers [#0]
138138

139139
Http2ConnectorFactory.FailedStart.ALPN=Failed to start ALPN
140-
141-
handlerCountMax=Parameter handlerCountMax is now deprecated
142-
handlerCountMaxIdle=Parameter handlerCountMaxIdle is now deprecated

0 commit comments

Comments
 (0)