From d6a5bee941a3a3cbdb4c2b9b44247331ff43da22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E8=89=B2?= <yanxx@shinemo.com>
Date: Wed, 28 Dec 2016 17:32:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=B00.7.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/logback.xml      | 26 +++++++++++++-------------
 src/main/resources/mpush.conf       |  2 +-
 src/test/resources/application.conf |  2 +-
 src/test/resources/logback.xml      | 20 ++++++++++----------
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index e320eda..870fce3 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -113,12 +113,12 @@
         </encoder>
     </appender>
 
-    <!-- redis log -->
-    <appender name="REDIS_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.home}/redis-mpush.log</file>
+    <!-- cache log -->
+    <appender name="CACHE_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.home}/cache-mpush.log</file>
         <append>true</append>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${log.home}/redis-mpush.log.%d{yyyy-MM-dd}
+            <fileNamePattern>${log.home}/cache-mpush.log.%d{yyyy-MM-dd}
             </fileNamePattern>
             <maxHistory>5</maxHistory>
         </rollingPolicy>
@@ -141,12 +141,12 @@
         </encoder>
     </appender>
 
-    <!-- zk log -->
-    <appender name="ZK_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.home}/zk-mpush.log</file>
+    <!-- SRD log -->
+    <appender name="SRD_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.home}/srd-mpush.log</file>
         <append>true</append>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${log.home}/zk-mpush.log.%d{yyyy-MM-dd}
+            <fileNamePattern>${log.home}/srd-mpush.log.%d{yyyy-MM-dd}
             </fileNamePattern>
             <maxHistory>10</maxHistory>
         </rollingPolicy>
@@ -210,13 +210,13 @@
         <level value="debug"/>
         <appender-ref ref="PUSH_APPENDER"/>
     </logger>
-    <logger name="mpush.redis.log" additivity="false">
+    <logger name="mpush.cache.log" additivity="false">
         <level value="debug"/>
-        <appender-ref ref="REDIS_APPENDER"/>
+        <appender-ref ref="CACHE_APPENDER"/>
     </logger>
-    <logger name="mpush.zk.log" additivity="false">
+    <logger name="mpush.srd.log" additivity="false">
         <level value="debug"/>
-        <appender-ref ref="ZK_APPENDER"/>
+        <appender-ref ref="SRD_APPENDER"/>
     </logger>
     <logger name="mpush.profile.log" additivity="false">
         <level value="debug"/>
@@ -227,4 +227,4 @@
         <level value="warn"/>
         <appender-ref ref="MPUSH_APPENDER"/>
     </logger>
-</configuration>
+</configuration>
\ No newline at end of file
diff --git a/src/main/resources/mpush.conf b/src/main/resources/mpush.conf
index feede92..e1c18c7 100644
--- a/src/main/resources/mpush.conf
+++ b/src/main/resources/mpush.conf
@@ -1,5 +1,5 @@
 mp.log-level=${log.level}
-mp.net.gateway-server-net=udp // 网关服务使用的网络 udp/tcp
+mp.net.gateway-server-net=tcp // 网关服务使用的网络 udp/tcp
 mp.net.alloc-server-port=9999
 mp.zk.server-address="127.0.0.1:2181"
 mp.redis {// redis 集群配置
diff --git a/src/test/resources/application.conf b/src/test/resources/application.conf
index 0ec3f26..2ddd22d 100644
--- a/src/test/resources/application.conf
+++ b/src/test/resources/application.conf
@@ -1,7 +1,7 @@
 mp.log.dir=${user.dir}/alloc/target/logs
 mp.log.level=debug
 mp.log-conf-path=logback.xml
-mp.net.gateway-server-net=udp // 网关服务使用的网络 udp/tcp
+mp.net.gateway-server-net=tcp // 网关服务使用的网络 udp/tcp
 mp.net.alloc-server-port=9999
 mp.zk.server-address="127.0.0.1:2181"
 mp.redis {// redis 集群配置
diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml
index ac2962c..a159ade 100644
--- a/src/test/resources/logback.xml
+++ b/src/test/resources/logback.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="true">
-
+    <property name="log.root.level" value="${log.root.level}"/> <!-- 日志级别 -->
     <!-- app log -->
     <appender name="MPUSH_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
         <target>System.err</target>
@@ -87,8 +87,8 @@
         </encoder>
     </appender>
 
-    <!-- redis log -->
-    <appender name="REDIS_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- cache log -->
+    <appender name="CACHE_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
         <target>System.out</target>
         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
             <level>DEBUG</level>
@@ -109,8 +109,8 @@
         </encoder>
     </appender>
 
-    <!-- zk log -->
-    <appender name="ZK_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- srd log -->
+    <appender name="SRD_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
         <target>System.out</target>
         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
             <level>DEBUG</level>
@@ -142,7 +142,7 @@
     </appender>
 
     <root>
-        <level value="debug"/>
+        <level value="${log.root.level}"/>
         <appender-ref ref="MPUSH_APPENDER"/>
         <appender-ref ref="MPUSH_INFO_APPENDER"/>
         <appender-ref ref="MPUSH_DEBUG_APPENDER"/>
@@ -172,13 +172,13 @@
         <level value="debug"/>
         <appender-ref ref="PUSH_APPENDER"/>
     </logger>
-    <logger name="mpush.redis.log" additivity="false">
+    <logger name="mpush.cache.log" additivity="false">
         <level value="debug"/>
-        <appender-ref ref="REDIS_APPENDER"/>
+        <appender-ref ref="CACHE_APPENDER"/>
     </logger>
-    <logger name="mpush.zk.log" additivity="false">
+    <logger name="mpush.srd.log" additivity="false">
         <level value="debug"/>
-        <appender-ref ref="ZK_APPENDER"/>
+        <appender-ref ref="SRD_APPENDER"/>
     </logger>
     <logger name="mpush.profile.log" additivity="false">
         <level value="debug"/>