From 33412466bb2d1c6029496ac276956fec73c0abd5 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 26 Apr 2021 21:53:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A2=B3=E7=90=86=20logback-spring.xml=20?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/deploy.sh                             |  1 +
 src/main/resources/application-dev.yaml   |  2 +-
 src/main/resources/application-local.yaml |  1 -
 src/main/resources/logback-spring.xml     | 10 ++++------
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/bin/deploy.sh b/bin/deploy.sh
index 479303f69..935d4606b 100644
--- a/bin/deploy.sh
+++ b/bin/deploy.sh
@@ -26,6 +26,7 @@ JAVA_OPS="-Xms512m -Xmx512m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=$HE
 # SkyWalking Agent 配置
 export SW_AGENT_NAME=$SERVER_NAME
 export SW_AGENT_COLLECTOR_BACKEND_SERVICES=192.168.0.84:11800
+export SW_GRPC_LOG_SERVER_HOST=192.168.0.84
 export JAVA_AGENT=-javaagent:/work/skywalking/apache-skywalking-apm-bin/agent/skywalking-agent.jar
 
 # 备份
diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-dev.yaml
index 1ecf43d6a..526bf3d51 100644
--- a/src/main/resources/application-dev.yaml
+++ b/src/main/resources/application-dev.yaml
@@ -145,7 +145,7 @@ spring:
 # 日志文件配置
 logging:
   file:
-    path: ${user.home}/logs/ # 日志文件的路径
+    name: ${user.home}/logs/${spring.application.name}.log # 日志文件名，全路径
 
 --- #################### 芋道相关配置 ####################
 
diff --git a/src/main/resources/application-local.yaml b/src/main/resources/application-local.yaml
index 9c30bf9f5..8761a78a8 100644
--- a/src/main/resources/application-local.yaml
+++ b/src/main/resources/application-local.yaml
@@ -145,7 +145,6 @@ spring:
 # 日志文件配置
 logging:
   file:
-#    path: ${user.home}/logs/ # 日志文件的路径
     name: ${user.home}/logs/${spring.application.name}.log # 日志文件名，全路径
 
 --- #################### 芋道相关配置 ####################
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index fb75bc3b1..1d9bec6dc 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -4,8 +4,7 @@
     <!-- 变量 yudao.info.base-package，基础业务包 -->
     <springProperty scope="context" name="yudao.info.base-package" source="yudao.info.base-package"/>
     <!-- 格式化输出：%d 表示日期，%X{tid} SkWalking 链路追踪编号，%thread 表示线程名，%-5level：级别从左显示 5 个字符宽度，%msg：日志消息，%n是换行符 -->
-<!--    <property name="PATTERN_DEFAULT" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%X{tid}] [%thread] %-5level %logger{36} -%msg%n"/>-->
-    <property name="PATTERN_DEFAULT" value="%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%thread] [%X{tid}] %-40.40logger{39} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"/>
+    <property name="PATTERN_DEFAULT" value="%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%thread] [%tid] %-40.40logger{39} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"/>
 
     <!-- 控制台 Appender -->
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">　　　　　
@@ -51,7 +50,7 @@
     <!-- SkyWalking GRPC 日志收集，实现日志中心。注意：SkyWalking 8.4.0 版本开始支持 -->
     <appender name="GRPC" class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.log.GRPCLogClientAppender">
         <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.mdc.TraceIdMDCPatternLogbackLayout">
+            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
                 <pattern>${PATTERN_DEFAULT}</pattern>
             </layout>
         </encoder>
@@ -61,9 +60,8 @@
     <springProfile name="local">
         <logger name="${yudao.info.base-package}" level="INFO" additivity="false">
             <appender-ref ref="STDOUT"/>
-            <appender-ref ref="GRPC"/>
-            <appender-ref ref="ASYNC"/>
-            <!-- 本地环境下，不打印日志文件 -->
+            <appender-ref ref="GRPC"/> <!-- 本地环境下，如果不想接入 SkyWalking 日志服务，可以注释掉本行 -->
+            <appender-ref ref="ASYNC"/>  <!-- 本地环境下，如果不想打印日志，可以注释掉本行 -->
         </logger>
     </springProfile>
     <!-- 其它环境 -->