Administrator 3 лет назад
Родитель
Сommit
b0908479aa
2 измененных файлов с 17 добавлено и 7 удалено
  1. 0 0
      src/main/resources/heartbeat-app.sh
  2. 17 7
      src/main/resources/logback.xml

src/main/resources/config/heartbeat-app.sh → src/main/resources/heartbeat-app.sh


+ 17 - 7
src/main/resources/logback.xml

@@ -25,19 +25,28 @@
     <!-- 控制台日志 -->
     <appender name="StdoutAppender" class="ch.qos.logback.core.ConsoleAppender">
         <withJansi>true</withJansi>
-        <encoder>
-            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
-            <charset>UTF-8</charset>
+<!--        <encoder>-->
+<!--            <pattern>${CONSOLE_LOG_PATTERN}</pattern>-->
+<!--            <charset>UTF-8</charset>-->
+<!--        </encoder>-->
+        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
+                <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level logger_name:%logger{36} - [%tid] - message:%msg%n</pattern>
+            </layout>
         </encoder>
     </appender>
     <!-- 按照每天生成常规日志文件 -->
     <appender name="FileAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${LOG_FILE}/${APP_NAME}.log</file>
+<!--        <encoder>-->
+<!--            <pattern>${CONSOLE_LOG_PATTERN_NO_COLOR}</pattern>-->
+<!--            <charset>UTF-8</charset>-->
+<!--        </encoder>-->
         <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-			<layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
-				<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level logger_name:%logger{36} - [%tid] - message:%msg%n</pattern>
-			</layout>
-		</encoder>
+            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
+                <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level logger_name:%logger{36} - [%tid] - message:%msg%n</pattern>
+            </layout>
+        </encoder>
         <!-- 基于时间的分包策略 -->
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
 			<fileNamePattern>${LOG_FILE}/${APP_NAME}.%d{yyyy-MM-dd}.%i.gz</fileNamePattern>
@@ -115,3 +124,4 @@
         <appender-ref ref="file_async"/>
     </root>
 </configuration>
+