Commit 33ab45fd0086a11582f2bb1c12bfae73938399b2

Authored by YunaiV
1 parent e351cdf7

梳理 logback-spring.xml 配置文件

src/main/java/cn/iocoder/dashboard/framework/tracer/core/aop/BizTraceAspect.java
... ... @@ -58,7 +58,7 @@ public class BizTraceAspect {
58 58 span.setTag(BizTrace.TYPE_TAG, StrUtil.toString(SpElUtil.analysisSpEl(trace.type(), joinPoint)));
59 59 span.setTag(BizTrace.ID_TAG, StrUtil.toString(SpElUtil.analysisSpEl(trace.id(), joinPoint)));
60 60 } catch (Exception ex) {
61   - log.error("[around][解析 bizType 与 bizId 发生异常]", ex);
  61 + log.error("[setBizTag][解析 bizType 与 bizId 发生异常]", ex);
62 62 }
63 63 }
64 64  
... ...
src/main/resources/application-local.yaml
... ... @@ -146,6 +146,7 @@ spring:
146 146 logging:
147 147 file:
148 148 path: ${user.home}/logs/ # 日志文件的路径
  149 + name: ${spring.application.name} # 日志文件名
149 150  
150 151 --- #################### 芋道相关配置 ####################
151 152  
... ...
src/main/resources/logback-spring.xml
1   -<configuration>  
2   -  
  1 +<configuration>
  2 + <!-- 变量 -->
  3 + <springProperty scope="context" name="yudao.info.base-package" source="yudao.info.base-package"/>
  4 + <property name="PATTERN_DEFAULT" value="%d{yyyy-MM-dd HH:mm:ss.SSS} | %tid | %thread | %-5level | %msg%n"/>
  5 +
  6 + <!-- 控制台 Appender -->
3 7 <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">     
4 8 <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
5 9 <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
6   - <pattern>%d{ISO8601} | %tid | %thread | %-5level | %msg%n</pattern>
  10 + <pattern>${PATTERN_DEFAULT}</pattern>
7 11 </layout>
8 12 </encoder>
9 13 </appender>
10 14  
  15 + <!-- 文件 Appender -->
11 16 <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
12   - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
13   - <FileNamePattern>./logs/ruoyi-vue-pro-%d{yyyy-MM-dd_HH}.log</FileNamePattern>
14   - <MaxHistory>3</MaxHistory>
15   - </rollingPolicy>
16 17 <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
17 18 <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
18   - <pattern>%d{ISO8601} | %tid | %thread | %-5level | %msg%n</pattern>
  19 + <pattern>${PATTERN_DEFAULT}</pattern>
19 20 </layout>
20 21 </encoder>
21   - <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
22   - <MaxFileSize>10MB</MaxFileSize>
23   - </triggeringPolicy>
  22 + <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
  23 + <fileNamePattern>${LOG_FILE}.%d{yyyy-MM-dd}.%i.log}</fileNamePattern>
  24 + <maxFileSize>10MB</maxFileSize>
  25 + <maxHistory>7</maxHistory>
  26 + <cleanHistoryOnStart>false</cleanHistoryOnStart>
  27 + </rollingPolicy>
24 28 </appender>
25   -
26 29 <appender name="ASYNC" class="ch.qos.logback.classic.AsyncAppender">
27 30 <discardingThreshold>0</discardingThreshold>
28 31 <queueSize>10</queueSize>
29 32 <appender-ref ref="FILE"/>
30 33 </appender>
31 34  
32   - <!-- skywalking grpc 日志收集 8.4.0版本开始支持 -->
  35 + <!-- SkyWalking GRPC 日志收集,实现日志中心。注意:SkyWalking 8.4.0 版本开始支持 -->
33 36 <appender name="GRPC" class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.log.GRPCLogClientAppender">
34 37 <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
35 38 <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.mdc.TraceIdMDCPatternLogbackLayout">
36   - <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%X{tid}] [%thread] %-5level %logger{36} -%msg%n</Pattern>
  39 + <pattern>${PATTERN_DEFAULT}</pattern>
37 40 </layout>
38   - </encoder>s
  41 + </encoder>
39 42 </appender>
40 43  
41   - <springProfile name="dev">
42   - <logger name="cn.iocoder.dashboard" level="INFO" additivity="false">
43   - <appender-ref ref="STDOUT"/>
44   - <appender-ref ref="ASYNC"/>
45   - </logger>
46   - </springProfile>
47   -
  44 + <!-- 本地环境 -->
48 45 <springProfile name="local">
49   - <logger name="cn.iocoder.dashboard" level="INFO" additivity="false">
  46 + <logger name="${yudao.info.base-package}" level="INFO" additivity="false">
50 47 <appender-ref ref="STDOUT"/>
51 48 <appender-ref ref="GRPC"/>
  49 + <appender-ref ref="ASYNC"/>
  50 + <!-- 本地环境下,不打印日志文件 -->
52 51 </logger>
53 52 </springProfile>
54   -
  53 + <!-- 其它环境 -->
55 54 <springProfile name="default">
56   - <logger name="cn.iocoder.dashboard" level="INFO" additivity="false">
  55 + <logger name="${yudao.info.base-package}" level="INFO" additivity="false">
57 56 <appender-ref ref="STDOUT"/>
58 57 <appender-ref ref="ASYNC"/>
  58 + <appender-ref ref="GRPC"/>
59 59 </logger>
60 60 </springProfile>
61 61  
62   - <root level="INFO">      
63   - <appender-ref ref="STDOUT"/>   
64   - <appender-ref ref="ASYNC"/> 
65   - </root>
66   -
67   - <logger name="cn.iocoder.dashboard" level="INFO">
68   - <appender-ref ref="STDOUT"/>
69   - </logger>
70 62 </configuration>
... ...