Browse Source

Update voovan to 4.2.3 (#5633)

* Update voovan.dockerfile

* Update pom.xml

* Update VoovanTFB.java

* Update framework.properties

* Update benchmark_config.json

* Update benchmark_config.json

* Update benchmark_config.json

* Rename voovan.dockerfile to voovan-mvc.dockerfile

* Update benchmark_config.json

* Rename voovan-mvc.dockerfile to voovan.dockerfile
hely ho 5 years ago
parent
commit
a8f37d2a6a

+ 1 - 1
frameworks/Java/voovan/benchmark_config.json

@@ -17,7 +17,7 @@
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "voovan-mvc",
-      "notes": "voovan",
+      "notes": "voovan webserver with mvc",
       "versus": "voovan"
     }
   }]

+ 1 - 1
frameworks/Java/voovan/config/framework.properties

@@ -2,7 +2,7 @@
 NoHeapManualRelease=true
 
 #when jvm nohup object is recycle, every this interval whill release nohup memory, default is 30
-NoHeapReleaseInterval = 30
+NoHeapReleaseInterval = 600
 
 #one cpu core's min thread size,  default is 2
 ThreadPoolMinSize= 1

+ 1 - 1
frameworks/Java/voovan/pom.xml

@@ -17,7 +17,7 @@
         <dependency>
             <groupId>org.voovan</groupId>
             <artifactId>voovan-framework</artifactId>
-            <version>4.2.2</version>
+            <version>4.2.3</version>
         </dependency>
     </dependencies>
     <build>

+ 8 - 4
frameworks/Java/voovan/src/main/java/org/voovan/VoovanTFB.java

@@ -20,7 +20,8 @@ import java.util.Objects;
 
 
 public class VoovanTFB {
-	private static final byte[] HELLO_WORLD = "Hello, World!".getBytes();
+	private static final String HELLO_WORLD_STR = "Hello, World!";
+	private static final byte[] HELLO_WORLD_BYTES = "Hello, World!".getBytes();
 
 	public static class Message {
 
@@ -53,24 +54,27 @@ public class VoovanTFB {
 		webServerConfig.setCache(true);
 		webServerConfig.getModuleonfigs().clear();
 		webServerConfig.getRouterConfigs().clear();
+		webServerConfig.setEnablePathVariables(false);
+                webServerConfig.setEnableWebSocket(false);
+		
 		WebServer webServer = WebServer.newInstance(webServerConfig);
 
 		//性能测试请求;
 		webServer.get("/plaintext", new HttpRouter() {
 			public void process(HttpRequest req, HttpResponse resp) throws Exception {
 				resp.header().put(HttpStatic.CONTENT_TYPE_STRING, HttpStatic.TEXT_PLAIN_STRING);
-				resp.write(HELLO_WORLD);
+				resp.write(HELLO_WORLD_BYTES);
 			}
 		});
 		//性能测试请求
 		webServer.get("/json", new HttpRouter() {
 			public void process(HttpRequest req, HttpResponse resp) throws Exception {
 				resp.header().put(HttpStatic.CONTENT_TYPE_STRING, HttpStatic.APPLICATION_JSON_STRING);
-				resp.write(JSON.toJSON(new Message("Hello, World!"), false, false));
+				resp.write(JSON.toJSON(new Message(HELLO_WORLD_STR), false, false));
 			}
 		});
 
-		Logger.setEnable(true);
+		Logger.setEnable(false);
 
 		webServer.serve();
 	}

+ 2 - 2
frameworks/Java/voovan/voovan.dockerfile

@@ -9,9 +9,9 @@ FROM openjdk:11.0.3-jdk-slim
 WORKDIR /voovan
 COPY --from=maven /voovan/target/voovan-bench-0.1-jar-with-dependencies.jar app.jar
 COPY --from=maven /voovan/config/framework.properties config/framework.properties
-CMD java -DThreadBufferPoolSize=1024 -DAsyncSend=false \
+CMD java -DCheckReadTimeout=false -DThreadBufferPoolSize=1024 -DAsyncSend=false \
     -server -Xms2g -Xmx2g \
-    --illegal-access=warn -XX:-RestrictContended \
+    -XX:-RestrictContended \
     -XX:+UseParallelGC -XX:+UseNUMA \
     -XX:+AggressiveOpts -XX:+UseBiasedLocking \
     -cp ./config:voovan.jar:app.jar org.voovan.VoovanTFB