压力测试通过

ChijieMa · Apr 9, 2016 · 225be90 · 225be90
1 parent 2a9d43f
commit 225be90
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 592 deletions.
diff --git a/cruntime/bundle/onight.tfw.oapi-2.1.3.jar b/cruntime/bundle/onight.tfw.oapi-2.1.3.jar
diff --git a/cruntime/conf/config.properties b/cruntime/conf/config.properties
@@ -113,8 +113,10 @@ felix.auto.start.2 = ${modules.dir}/tfw/redis/onight.tfw.redisimpl-1.0.0.jar \
 	${modules.dir}/mgame/act/onight.mgame.actmysql-1.0.0.jar \
 	${modules.dir}/mgame/act/onight.mgame.actcore-1.0.1.jar
 
-	#file:///Users/brew/Documents/KJ/MING/git/mgame/act/actcore/build/libs/onight.mgame.actcore-1.0.1.jar
+#	file:///Users/brew/Documents/KJ/MING/git/mgame/act/actcore/build/libs/onight.mgame.actcore-1.0.1.jar
 
+#${modules.dir}/mgame/act/onight.mgame.actcore-1.0.1.jar
+
 cgame.dir = file:///Users/brew/Documents/ming/cgame
 
 felix.auto.start.3 = ${cgame.dir}/cmysqlimpl/build/libs/starstart.cgame.cmysqlimpl-1.0.0.jar \

diff --git a/cruntime/conf/logback.xml b/cruntime/conf/logback.xml
@@ -17,8 +17,8 @@
         </appender>
 
 	<root level="debug">
-		<appender-ref ref="STDOUT" />
-		<!-- <appender-ref ref="FILE" /> -->
+		<!-- <appender-ref ref="STDOUT" FILE /> -->
+		 <appender-ref ref="STDOUT" />
 	</root>
 
 <logger name="org.eclipse.jetty" level="info">

diff --git a/cruntime/conf/ofw.properties b/cruntime/conf/ofw.properties
@@ -17,9 +17,9 @@ insert.run.thread = 100
 
 insert.batchsize = 50
 
-insert.run.checkcount = 2
+insert.run.checkcount = 10
 
-insert.run.periodms = 1000
+insert.run.periodms = 100
 
 #################
 # for MQ

diff --git a/cruntime/modules/mgame/act/onight.mgame.actcore-1.0.1.jar b/cruntime/modules/mgame/act/onight.mgame.actcore-1.0.1.jar
diff --git a/cruntime/modules/tfw/nio/onight.tfw.otransio-2.0.1.jar b/cruntime/modules/tfw/nio/onight.tfw.otransio-2.0.1.jar
diff --git a/gateway/src/main/scala/starstart/cgw/scala/action/MsgMergeService.scala b/gateway/src/main/scala/starstart/cgw/scala/action/MsgMergeService.scala
@@ -200,7 +200,7 @@ object CGWMsgMergeService extends OLog with PBUtils with LService[PWMergeProxy]
         p.failure(e);
       }
     };
-    Sender.ps.asyncSend(forwordpack).whenDone(cb);
+    Sender.ps.asyncSend(forwordpack,cb);
     p.future;
   }
 

diff --git a/webui/.idea/workspace.xml b/webui/.idea/workspace.xml