From 3ff9d260f2c664e4a434d21c696927d0d1efd5d5 Mon Sep 17 00:00:00 2001
From: Daniel Qian <chanjarster@gmail.com>
Date: Thu, 22 Jan 2015 13:27:47 +0800
Subject: [PATCH] =?UTF-8?q?issue=20#23=20=E4=BD=BF=E7=94=A8logback?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=BA=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95=E7=9A=84?=
 =?UTF-8?q?log=E5=B7=A5=E5=85=B7=EF=BC=8C=E5=B9=B6=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=9A=84log?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                          |  7 ++++---
 .../src/test/resources/logback-test.xml          | 16 ++++++++++++++++
 .../chanjar/weixin/cp/api/WxCpMessageRouter.java |  4 ++--
 .../src/test/resources/logback-test.xml          | 16 ++++++++++++++++
 .../chanjar/weixin/mp/api/WxMpMessageRouter.java |  4 ++--
 .../src/test/resources/logback-test.xml          | 16 ++++++++++++++++
 6 files changed, 56 insertions(+), 7 deletions(-)
 create mode 100644 weixin-java-common/src/test/resources/logback-test.xml
 create mode 100644 weixin-java-cp/src/test/resources/logback-test.xml
 create mode 100644 weixin-java-mp/src/test/resources/logback-test.xml

diff --git a/pom.xml b/pom.xml
index 8ce73cd49..01cadc11e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,7 @@
     <downloadSources>true</downloadSources>
     <httpclient.version>4.3.5</httpclient.version>
     <slf4j.version>1.7.10</slf4j.version>
+    <logback.version>1.1.2</logback.version>
   </properties>
 
   <dependencies>
@@ -52,9 +53,9 @@
       <version>${slf4j.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-      <version>${slf4j.version}</version>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>${logback.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/weixin-java-common/src/test/resources/logback-test.xml b/weixin-java-common/src/test/resources/logback-test.xml
new file mode 100644
index 000000000..c0d6fc3ca
--- /dev/null
+++ b/weixin-java-common/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- encoders are assigned the type
+         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="info">
+    <appender-ref ref="STDOUT" />
+  </root>
+
+  <logger name="me.chanjar.weixin.common" level="debug" />
+</configuration>
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpMessageRouter.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpMessageRouter.java
index 366effc84..7ae9d4444 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpMessageRouter.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpMessageRouter.java
@@ -150,7 +150,7 @@ public class WxCpMessageRouter {
       } else {
         res = rule.service(wxMessage);
         // 在同步操作结束，session访问结束
-        log.trace("End session access after sync operation finish {}", wxMessage.getFromUserName());
+        log.debug("End session access: async=false, sessionId={}", wxMessage.getFromUserName());
         sessionEndAccess(wxMessage);
       }
     }
@@ -162,7 +162,7 @@ public class WxCpMessageRouter {
           for (Future future : futures) {
             try {
               future.get();
-              log.trace("End session access after async operation finish {}", wxMessage.getFromUserName());
+              log.debug("End session access: async=true, sessionId={}", wxMessage.getFromUserName());
               // 异步操作结束，session访问结束
               sessionEndAccess(wxMessage);
             } catch (InterruptedException e) {
diff --git a/weixin-java-cp/src/test/resources/logback-test.xml b/weixin-java-cp/src/test/resources/logback-test.xml
new file mode 100644
index 000000000..9c2ec6ae3
--- /dev/null
+++ b/weixin-java-cp/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- encoders are assigned the type
+         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="info">
+    <appender-ref ref="STDOUT" />
+  </root>
+
+  <logger name="me.chanjar.weixin.cp" level="debug" />
+</configuration>
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java
index ccf9f19e8..5c09b48f5 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java
@@ -148,7 +148,7 @@ public class WxMpMessageRouter {
       } else {
         res = rule.service(wxMessage);
         // 在同步操作结束，session访问结束
-        log.trace("End session access after sync operation finish {}", wxMessage.getFromUserName());
+        log.debug("End session access: async=false, sessionId={}", wxMessage.getFromUserName());
         sessionEndAccess(wxMessage);
       }
     }
@@ -160,7 +160,7 @@ public class WxMpMessageRouter {
           for (Future future : futures) {
             try {
               future.get();
-              log.trace("End session access after async operation finish {}", wxMessage.getFromUserName());
+              log.debug("End session access: async=true, sessionId={}", wxMessage.getFromUserName());
               // 异步操作结束，session访问结束
               sessionEndAccess(wxMessage);
             } catch (InterruptedException e) {
diff --git a/weixin-java-mp/src/test/resources/logback-test.xml b/weixin-java-mp/src/test/resources/logback-test.xml
new file mode 100644
index 000000000..ed5951012
--- /dev/null
+++ b/weixin-java-mp/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- encoders are assigned the type
+         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="info">
+    <appender-ref ref="STDOUT" />
+  </root>
+
+  <logger name="me.chanjar.weixin.mp" level="debug" />
+</configuration>