From 80b92cff33f59d2f8fcb73c6e8811ab6d5f350e7 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 4 Feb 2020 14:43:39 +0800
Subject: [PATCH] 1

---
 common.sh         | 4 +++-
 third_party/tools | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/common.sh b/common.sh
index 59818a0..df134c1 100644
--- a/common.sh
+++ b/common.sh
@@ -1,4 +1,5 @@
 GAME_ID=1009
+LOG4J2_FILE="conf/log4j2.xml"
 JAR_NAME="lib/game-cross-1.0.jar"
 if [ ! -f "bin/is_test_env" ]; then
     JAVA_OPTS="-server -Xms512m -Xmx512m -Xmn128m -XX:SurvivorRatio=4 -XX:InitiatingHeapOccupancyPercent=75"
@@ -7,7 +8,8 @@ else
 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="conf/log4j2.xml"
+JAVA_OPTS="$JAVA_OPTS -Dlog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector"
+JAVA_OPTS="$JAVA_OPTS -Dlog4j.configurationFile=${LOG4J2_FILE}"
 
 SOURCE_PATH="third_party/wjtx/trunk/"
 PRE_COMPILE_CMD=""
diff --git a/third_party/tools b/third_party/tools
index ee15a08..7a56029 160000
--- a/third_party/tools
+++ b/third_party/tools
@@ -1 +1 @@
-Subproject commit ee15a08727a3241e055f8b02611b80c1da8fc312
+Subproject commit 7a560291e310bb85a4aa72d33017219cc5e7356c