diff --git a/common.sh b/common.sh index d2cbb23..c53fb91 100644 --- a/common.sh +++ b/common.sh @@ -1,13 +1,15 @@ GAME_ID=1009 +LOG4J2_FILE="config/log4j2.xml" JAR_NAME="lib/web-gate-1.0.jar" if [ ! -f "bin/is_test_env" ]; then - JAVA_OPTS="-server -Xms512m -Xmx512m -Xmn128m -XX:SurvivorRatio=4 -XX:InitiatingHeapOccupancyPercent=75" + JVM_OPTS="-server -Xms512m -Xmx512m -Xmn256m -XX:PermSize=64m -XX:MaxPermSize=128m -XX:MaxDirectMemorySize=1024m" else - JAVA_OPTS="-server -Xms256m -Xmx256m -Xmn128m -XX:SurvivorRatio=4 -XX:InitiatingHeapOccupancyPercent=75" + JVM_OPTS="-server -Xms256m -Xmx256m -Xmn256m -XX:PermSize=64m -XX:MaxPermSize=128m -XX:MaxDirectMemorySize=1024m" fi JAVA_OPTS="$JAVA_OPTS -XX:+UseParNewGC -XX:+UseConcMarkSweepGC" -JAVA_OPTS="$JAVA_OPTS -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationStoppedTime -XX:+HeapDumpOnOutOfMemoryError -Xloggc:logs/flash_gc_$(date +"%Y%m%d%H%M").log" -LOG4J2_FILE="config/log4j2.xml" +JAVA_OPTS="$JAVA_OPTS -XX:+TieredCompilation" +JAVA_OPTS="$JAVA_OPTS -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationStoppedTime -XX:+HeapDumpOnOutOfMemoryError -Xloggc:log/flash_gc_$(date +"%Y%m%d%H%M").log" +JAVA_OPTS="$JAVA_OPTS -Dlog4j.configurationFile=${LOG4J2_FILE}" SOURCE_PATH="third_party/wjtx/trunk/" PRE_COMPILE_CMD="mvn clean package install -Dmaven.test.skip=true" diff --git a/third_party/tools b/third_party/tools index ee15a08..1cc9d69 160000 --- a/third_party/tools +++ b/third_party/tools @@ -1 +1 @@ -Subproject commit ee15a08727a3241e055f8b02611b80c1da8fc312 +Subproject commit 1cc9d69831060f204798ab993c21ee9ed9b63d56