From fda62a1feb541e9e21e9c8ab9765a4fe477956a3 Mon Sep 17 00:00:00 2001
From: "Chaoyun.Yep" <senyepss@gmail.com>
Date: Tue, 10 Dec 2024 09:51:35 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=20logback.?=
 =?UTF-8?q?xml=20=E8=B7=AF=E5=BE=84=E9=85=8D=E7=BD=AE=EF=BC=8C=E7=94=B1?=
 =?UTF-8?q?=E4=BA=8E=20logback.xml=20=E6=AF=94=20Spring=20=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E4=BC=98=E5=85=88=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=EF=BC=8C=E6=97=A0=E6=B3=95=E8=AF=BB=E5=8F=96=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=95=85=E6=9B=B4=E5=90=8D=E4=B8=BA?=
 =?UTF-8?q?=20logback-spring.xml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.properties        | 12 ++++++++++++
 .../resources/{logback.xml => logback-spring.xml}    |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 rename xxl-job-admin/src/main/resources/{logback.xml => logback-spring.xml} (92%)

diff --git a/xxl-job-admin/src/main/resources/application.properties b/xxl-job-admin/src/main/resources/application.properties
index d438057daf..53e1688c2d 100644
--- a/xxl-job-admin/src/main/resources/application.properties
+++ b/xxl-job-admin/src/main/resources/application.properties
@@ -64,3 +64,15 @@ xxl.job.triggerpool.slow.max=100
 
 ### xxl-job, log retention days
 xxl.job.logretentiondays=30
+
+### logging
+# Add line number to the console log
+logging.pattern.console: %clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) \
+  %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} \
+  %clr([L:%line]){faint} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:%wEx}
+# log path
+logging.file.path: ${module.base-path}/xxl-job
+
+
+### module
+module.base-path: /data/applogs
\ No newline at end of file
diff --git a/xxl-job-admin/src/main/resources/logback.xml b/xxl-job-admin/src/main/resources/logback-spring.xml
similarity index 92%
rename from xxl-job-admin/src/main/resources/logback.xml
rename to xxl-job-admin/src/main/resources/logback-spring.xml
index d4b08c2403..caddf58cc1 100644
--- a/xxl-job-admin/src/main/resources/logback.xml
+++ b/xxl-job-admin/src/main/resources/logback-spring.xml
@@ -2,7 +2,7 @@
 <configuration debug="false" scan="true" scanPeriod="1 seconds">
 
     <contextName>logback</contextName>
-    <property name="log.path" value="/data/applogs/xxl-job/xxl-job-admin.log"/>
+    <property name="log.path" value="${LOG_PATH}/xxl-job-admin.log"/>
 
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>