Skip to content

test #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

test #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
056ae3c
配置
cbq881215 Jul 22, 2020
ded3c07
配置
cbq881215 Jul 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 28 additions & 14 deletions ...embed-tomcat/src/main/java/net/jplugin/extension/embed_tomcat/impl/EmbedTomcatConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,29 +15,32 @@ public class EmbedTomcatConfig {
private static final String CONTEXT_NAME = "embed-tomcat.context-name";


private static final String PROTOCOL_COMPRESSABLE_MIME_TYPE = "embed-tomcat.protocol.compressable-mime-type";
private static final String PROTOCOL_COMPRESSABLE_MIME_TYPE = "embed-tomcat.protocol-compressable-mime-type";


private static final String PROTOCOL_MAX_THREADS = "embed-tomcat.protocol.max-threads";
private static final String PROTOCOL_MAX_THREADS = "embed-tomcat.protocol-max-threads";


private static final String PROTOCOL_MAX_CONNECTIONS = "embed-tomcat.protocol.max-connections";
private static final String PROTOCOL_MAX_CONNECTIONS = "embed-tomcat.protocol-max-connections";

private static final String PROTOCOL_CONNECTION_TIMEOUT = "embed-tomcat.protocol.connection-timeout";
private static final String PROTOCOL_CONNECTION_TIMEOUT = "embed-tomcat.protocol-connection-timeout";

private static final String PROTOCOL_MIN_SPARE_THREADS = "embed-tomcat.protocol.min-spare-threads";
private static final String PROTOCOL_MIN_SPARE_THREADS = "embed-tomcat.protocol-min-spare-threads";

private static final String PROTOCOL_KEEPALIVE_TIMEOUT = "embed-tomcat.protocol.keepalive-timeout";
private static final String PROTOCOL_KEEPALIVE_TIMEOUT = "embed-tomcat.protocol-keepalive-timeout";


private static final String PROTOCOL_ACCEPTOR_THREADCOUNT = "embed-tomcat.protocol.acceptor-threadCount";
private static final String PROTOCOL_ACCEPTOR_THREADCOUNT = "embed-tomcat.protocol-acceptor-threadCount";

private static final String REDIRECT_PORT = "embed-tomcat.redirect-port";

private static final String URL_ENCODING = "embed-tomcat.uri-encoding";

private static final String MAX_POST_SIZE = "embed-tomcat.max-post-size";

private static final String USE_BODY_ENCODING_FOR_URI = "embed-tomcat.use-body-encoding-for-uri";


private static final String PROTOCOL_COMPRESSION = "embed-tomcat.protocol.compression";


Expand All @@ -56,6 +59,7 @@ public class EmbedTomcatConfig {
private static String compressableMimeType;
private static Integer maxPostSize;
private static String compression;
private static Boolean useBodyEncodingForURI;

public static void init() {
tomcatPort = ConfigFactory.getIntConfig(TOMCAT_PORT, 8080);
Expand All @@ -80,15 +84,21 @@ public static void init() {

maxPostSize = ConfigFactory.getIntConfig(MAX_POST_SIZE);

compression= ConfigFactory.getStringConfigWithTrim(PROTOCOL_COMPRESSION);
compression = ConfigFactory.getStringConfigWithTrim(PROTOCOL_COMPRESSION);

useBodyEncodingForURI = "true".equalsIgnoreCase(ConfigFactory.getStringConfigWithTrim(USE_BODY_ENCODING_FOR_URI));
StringBuffer sb = new StringBuffer();
sb.append("$$$ Embed Tomcat config:\n tomcatPort=" + tomcatPort)
.append("\n useWebSupport:" + useWebSupport)
.append("\n contextName:" + contextName)
.append("\n maxThreads:" + maxThreads)
.append("\n maxConnections:" + maxConnections)
.append("\n connectionTimeout:" + connectionTimeout);
.append("\n maxThreads:" + maxThreads)
.append("\n maxConnections:" + maxConnections)
.append("\n compressableMimeType:" + compressableMimeType)
.append("\n redirectPort:" + redirectPort)
.append("\n connectionTimeout:" + connectionTimeout)
.append("\n maxPostSize:" + maxPostSize)
.append("\n compression:" + compression)
.append("\n useBodyEncodingForURI:" + useBodyEncodingForURI);


PluginEnvirement.getInstance().getStartLogger().log(sb.toString());
Expand Down Expand Up @@ -145,11 +155,15 @@ public static String getUriEncoding() {
return uriEncoding;
}

public static Integer getMaxPostSize() {
return maxPostSize;
}
public static Integer getMaxPostSize() {
return maxPostSize;
}

public static String getCompression() {
return compression;
}

public static Boolean getUseBodyEncodingForURI() {
return useBodyEncodingForURI;
}
}
19 changes: 12 additions & 7 deletions ...gin-embed-tomcat/src/main/java/net/jplugin/extension/embed_tomcat/impl/TomcatStarter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,18 @@ public static Tomcat start() throws Exception {
/**
* <Connector port="8080" protocol="org.apache.coyote.http11.Http11NioProtocol"
* connectionTimeout="20000" ok
* URIEncoding="UTF-8"
* useBodyEncodingForURI="false"
* URIEncoding="UTF-8" ok
* useBodyEncodingForURI="false" ok
* maxThreads="1000" ok
* minSpareThreads="100" ok
* enableLookups="false"
* redirectPort="8443"
* redirectPort="8443" ok
* acceptCount="800"
* compression="on"
* compression="on" ok
* compressionMinSize="20480"
* noCompressionUserAgents="gozilla, traviata"
* maxPostSize="209715200"
* compressableMimeType="text/html,text/xml,text/plain,text/javascript,text/css,application/octet-stream" />
* maxPostSize="209715200" ok
* compressableMimeType="text/html,text/xml,text/plain,text/javascript,text/css,application/octet-stream" /> on
*
* @param connector
*/
Expand All @@ -76,11 +76,14 @@ private static void customConnector(Connector connector) {
if (EmbedTomcatConfig.getRedirectPort() != null) {
connector.setRedirectPort(EmbedTomcatConfig.getRedirectPort());
}

if (EmbedTomcatConfig.getUriEncoding() != null && !"".equals(EmbedTomcatConfig.getUriEncoding())) {
connector.setURIEncoding(EmbedTomcatConfig.getUriEncoding());
}

if(EmbedTomcatConfig.getUseBodyEncodingForURI()!=null){
connector.setUseBodyEncodingForURI(EmbedTomcatConfig.getUseBodyEncodingForURI());
}


// 设置最大线程数
if (EmbedTomcatConfig.getMaxThreads() != null) {
Expand Down Expand Up @@ -122,8 +125,10 @@ private static void customConnector(Connector connector) {
if (EmbedTomcatConfig.getCompression() != null && !"".equals(EmbedTomcatConfig.getCompression())) {
protocol.setCompression(EmbedTomcatConfig.getCompression());
}

//protocol.setNoCompressionUserAgents("gozilla, traviata");


}

/**
Expand Down
2 changes: 2 additions & 0 deletions jplugin-embed-tomcat/src/main/resources/config/embed-tomcat.config.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ protocol.max-threads=1000
#redirect-port=
#uri-encoding=
#max-post-size=
#use-body-encoding-for-uri=
#protocol.max-threads=
#protocol.max-connections=
#protocol.connection-timeout=
#protocol.min-spare-threads=
#protocol.keepalive-timeout=
#protocol.acceptor-threadCount=
#protocol.compression=