From 52a97b892cf130eadf58d4885915e10816cd7bbe Mon Sep 17 00:00:00 2001
From: LamGC <lam827@lamgc.net>
Date: Thu, 17 Feb 2022 19:27:02 +0800
Subject: [PATCH] =?UTF-8?q?refactor(logging):=20=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=8D=E5=90=8C=E8=BF=90=E8=A1=8C=E7=8E=AF=E5=A2=83=E4=B8=8B?=
 =?UTF-8?q?=E7=9A=84=E6=97=A5=E5=BF=97=E9=85=8D=E7=BD=AE.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

使用 logback 中配置的引用功能, 为 scalabot-app 模块设置了开发环境与生产环境的日志配置,
目前仅最低级别不同外没啥区别.
---
 scalabot-app/build.gradle.kts                 |  6 +++-
 .../src/main/resources/base-logback.xml       | 32 +++++++++++++++++++
 .../src/main/resources/logback-test.xml       |  9 ++++++
 scalabot-app/src/main/resources/logback.xml   | 30 +----------------
 4 files changed, 47 insertions(+), 30 deletions(-)
 create mode 100644 scalabot-app/src/main/resources/base-logback.xml
 create mode 100644 scalabot-app/src/main/resources/logback-test.xml

diff --git a/scalabot-app/build.gradle.kts b/scalabot-app/build.gradle.kts
index 4c05d8c..e172ee2 100644
--- a/scalabot-app/build.gradle.kts
+++ b/scalabot-app/build.gradle.kts
@@ -40,4 +40,8 @@ tasks.withType<KotlinCompile> {
 
 application {
     mainClass.set("net.lamgc.scalabot.AppMainKt")
-}
\ No newline at end of file
+}
+
+tasks.jar.configure {
+    exclude("**/logback-test.xml")
+}
diff --git a/scalabot-app/src/main/resources/base-logback.xml b/scalabot-app/src/main/resources/base-logback.xml
new file mode 100644
index 0000000..a9fccd7
--- /dev/null
+++ b/scalabot-app/src/main/resources/base-logback.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<included>
+    <appender name="STD_OUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>[%d{HH:mm:ss.SSS} %5level][%logger{36}][%thread]: %msg%n</pattern>
+        </encoder>
+        <filter class="net.lamgc.scalabot.util.StdOutFilter">
+
+        </filter>
+    </appender>
+
+    <appender name="STD_ERR" class="ch.qos.logback.core.ConsoleAppender">
+        <target>System.err</target>
+        <encoder>
+            <pattern>%red([%d{HH:mm:ss.SSS} %5level][%logger{36}][%thread]: %msg%n)</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level>
+        </filter>
+    </appender>
+
+    <appender name="FILE_OUT" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>data/logs/latest.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>data/logs/%d{yyyy-MM-dd}.log.gz</fileNamePattern>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>[%d{HH:mm:ss.SSS} %5level][%logger{36}][%thread]: %msg%n</pattern>
+        </encoder>
+    </appender>
+</included>
\ No newline at end of file
diff --git a/scalabot-app/src/main/resources/logback-test.xml b/scalabot-app/src/main/resources/logback-test.xml
new file mode 100644
index 0000000..5faf0c1
--- /dev/null
+++ b/scalabot-app/src/main/resources/logback-test.xml
@@ -0,0 +1,9 @@
+<configuration scan="false" debug="false">
+    <include resource="base-logback.xml"/>
+
+    <root level="DEBUG">
+        <appender-ref ref="FILE_OUT"/>
+        <appender-ref ref="STD_ERR"/>
+        <appender-ref ref="STD_OUT"/>
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/scalabot-app/src/main/resources/logback.xml b/scalabot-app/src/main/resources/logback.xml
index cbe9f5c..041f5fa 100644
--- a/scalabot-app/src/main/resources/logback.xml
+++ b/scalabot-app/src/main/resources/logback.xml
@@ -1,33 +1,5 @@
 <configuration scan="false" debug="false">
-    <appender name="STD_OUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>[%d{HH:mm:ss.SSS} %5level][%logger{36}][%thread]: %msg%n</pattern>
-        </encoder>
-        <filter class="net.lamgc.scalabot.util.StdOutFilter">
-
-        </filter>
-    </appender>
-
-    <appender name="STD_ERR" class="ch.qos.logback.core.ConsoleAppender">
-        <target>System.err</target>
-        <encoder>
-            <pattern>%red([%d{HH:mm:ss.SSS} %5level][%logger{36}][%thread]: %msg%n)</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>WARN</level>
-        </filter>
-    </appender>
-
-    <appender name="FILE_OUT" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>data/logs/latest.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>data/logs/%d{yyyy-MM-dd}.log.gz</fileNamePattern>
-            <maxHistory>30</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>[%d{HH:mm:ss.SSS} %5level][%logger{36}][%thread]: %msg%n</pattern>
-        </encoder>
-    </appender>
+    <include resource="base-logback.xml"/>
 
     <root level="INFO">
         <appender-ref ref="FILE_OUT"/>