Skip to content

Commit d6a5bee

Browse files
author
夜色
committed
升级到0.7.0
1 parent e224ada commit d6a5bee

File tree

4 files changed

+25
-25
lines changed

4 files changed

+25
-25
lines changed

‎src/main/resources/logback.xml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,12 @@
113113
</encoder>
114114
</appender>
115115

116-
<!-- redis log -->
117-
<appender name="REDIS_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
118-
<file>${log.home}/redis-mpush.log</file>
116+
<!-- cache log -->
117+
<appender name="CACHE_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
118+
<file>${log.home}/cache-mpush.log</file>
119119
<append>true</append>
120120
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
121-
<fileNamePattern>${log.home}/redis-mpush.log.%d{yyyy-MM-dd}
121+
<fileNamePattern>${log.home}/cache-mpush.log.%d{yyyy-MM-dd}
122122
</fileNamePattern>
123123
<maxHistory>5</maxHistory>
124124
</rollingPolicy>
@@ -141,12 +141,12 @@
141141
</encoder>
142142
</appender>
143143

144-
<!-- zk log -->
145-
<appender name="ZK_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
146-
<file>${log.home}/zk-mpush.log</file>
144+
<!-- SRD log -->
145+
<appender name="SRD_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
146+
<file>${log.home}/srd-mpush.log</file>
147147
<append>true</append>
148148
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
149-
<fileNamePattern>${log.home}/zk-mpush.log.%d{yyyy-MM-dd}
149+
<fileNamePattern>${log.home}/srd-mpush.log.%d{yyyy-MM-dd}
150150
</fileNamePattern>
151151
<maxHistory>10</maxHistory>
152152
</rollingPolicy>
@@ -210,13 +210,13 @@
210210
<level value="debug"/>
211211
<appender-ref ref="PUSH_APPENDER"/>
212212
</logger>
213-
<logger name="mpush.redis.log" additivity="false">
213+
<logger name="mpush.cache.log" additivity="false">
214214
<level value="debug"/>
215-
<appender-ref ref="REDIS_APPENDER"/>
215+
<appender-ref ref="CACHE_APPENDER"/>
216216
</logger>
217-
<logger name="mpush.zk.log" additivity="false">
217+
<logger name="mpush.srd.log" additivity="false">
218218
<level value="debug"/>
219-
<appender-ref ref="ZK_APPENDER"/>
219+
<appender-ref ref="SRD_APPENDER"/>
220220
</logger>
221221
<logger name="mpush.profile.log" additivity="false">
222222
<level value="debug"/>
@@ -227,4 +227,4 @@
227227
<level value="warn"/>
228228
<appender-ref ref="MPUSH_APPENDER"/>
229229
</logger>
230-
</configuration>
230+
</configuration>

‎src/main/resources/mpush.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
mp.log-level=${log.level}
2-
mp.net.gateway-server-net=udp // 网关服务使用的网络 udp/tcp
2+
mp.net.gateway-server-net=tcp // 网关服务使用的网络 udp/tcp
33
mp.net.alloc-server-port=9999
44
mp.zk.server-address="127.0.0.1:2181"
55
mp.redis {// redis 集群配置

‎src/test/resources/application.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
mp.log.dir=${user.dir}/alloc/target/logs
22
mp.log.level=debug
33
mp.log-conf-path=logback.xml
4-
mp.net.gateway-server-net=udp // 网关服务使用的网络 udp/tcp
4+
mp.net.gateway-server-net=tcp // 网关服务使用的网络 udp/tcp
55
mp.net.alloc-server-port=9999
66
mp.zk.server-address="127.0.0.1:2181"
77
mp.redis {// redis 集群配置

‎src/test/resources/logback.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<configuration debug="true">
3-
3+
<property name="log.root.level" value="${log.root.level}"/> <!-- 日志级别 -->
44
<!-- app log -->
55
<appender name="MPUSH_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
66
<target>System.err</target>
@@ -87,8 +87,8 @@
8787
</encoder>
8888
</appender>
8989

90-
<!-- redis log -->
91-
<appender name="REDIS_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
90+
<!-- cache log -->
91+
<appender name="CACHE_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
9292
<target>System.out</target>
9393
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
9494
<level>DEBUG</level>
@@ -109,8 +109,8 @@
109109
</encoder>
110110
</appender>
111111

112-
<!-- zk log -->
113-
<appender name="ZK_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
112+
<!-- srd log -->
113+
<appender name="SRD_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
114114
<target>System.out</target>
115115
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
116116
<level>DEBUG</level>
@@ -142,7 +142,7 @@
142142
</appender>
143143

144144
<root>
145-
<level value="debug"/>
145+
<level value="${log.root.level}"/>
146146
<appender-ref ref="MPUSH_APPENDER"/>
147147
<appender-ref ref="MPUSH_INFO_APPENDER"/>
148148
<appender-ref ref="MPUSH_DEBUG_APPENDER"/>
@@ -172,13 +172,13 @@
172172
<level value="debug"/>
173173
<appender-ref ref="PUSH_APPENDER"/>
174174
</logger>
175-
<logger name="mpush.redis.log" additivity="false">
175+
<logger name="mpush.cache.log" additivity="false">
176176
<level value="debug"/>
177-
<appender-ref ref="REDIS_APPENDER"/>
177+
<appender-ref ref="CACHE_APPENDER"/>
178178
</logger>
179-
<logger name="mpush.zk.log" additivity="false">
179+
<logger name="mpush.srd.log" additivity="false">
180180
<level value="debug"/>
181-
<appender-ref ref="ZK_APPENDER"/>
181+
<appender-ref ref="SRD_APPENDER"/>
182182
</logger>
183183
<logger name="mpush.profile.log" additivity="false">
184184
<level value="debug"/>

0 commit comments

Comments
 (0)