From 28658b71e57abe473bbeeac245e893b6c0e6bd45 Mon Sep 17 00:00:00 2001 From: xiqiu Date: Fri, 10 Dec 2021 17:04:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?KERNEL-9862=20druid=20log4j2=E7=9A=84?= =?UTF-8?q?=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/third/alibaba/druid/support/logging/LogFactory.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fine-druid/src/main/java/com/fr/third/alibaba/druid/support/logging/LogFactory.java b/fine-druid/src/main/java/com/fr/third/alibaba/druid/support/logging/LogFactory.java index 96a266784..2db9794cb 100644 --- a/fine-druid/src/main/java/com/fr/third/alibaba/druid/support/logging/LogFactory.java +++ b/fine-druid/src/main/java/com/fr/third/alibaba/druid/support/logging/LogFactory.java @@ -38,6 +38,8 @@ public class LogFactory { tryImplementation("java.util.logging.Logger", "Jdk14LoggingImpl"); } } + // 优先选择log4j2防止漏洞 + tryImplementation("com.fr.third.apache.logging.log4j.Logger", "FRLog4j2Impl"); // 优先选择log4j,而非Apache Common Logging. 因为后者无法设置真实Log调用者的信息 tryImplementation("com.fr.third.apache.log4j.Logger", "FRLog4jImpl"); tryImplementation("org.apache.log4j.Logger", "Log4jImpl"); From 36805e2dbf31cccdd9bd85a057e74f87b2f9e37d Mon Sep 17 00:00:00 2001 From: xiqiu Date: Fri, 10 Dec 2021 17:28:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?KERNEL-9862=20=E8=A1=A5=E4=B8=8A=E8=A2=AB?= =?UTF-8?q?=E8=AF=AF=E5=88=A0=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/third/alibaba/druid/support/logging/LogFactory.java | 1 + 1 file changed, 1 insertion(+) diff --git a/fine-druid/src/main/java/com/fr/third/alibaba/druid/support/logging/LogFactory.java b/fine-druid/src/main/java/com/fr/third/alibaba/druid/support/logging/LogFactory.java index 57092f9c0..ef8b4d0bc 100644 --- a/fine-druid/src/main/java/com/fr/third/alibaba/druid/support/logging/LogFactory.java +++ b/fine-druid/src/main/java/com/fr/third/alibaba/druid/support/logging/LogFactory.java @@ -41,6 +41,7 @@ public class LogFactory { // 优先选择log4j2防止漏洞 tryImplementation("com.fr.third.apache.logging.log4j.Logger", "FRLog4j2Impl"); // 优先选择log4j,而非Apache Common Logging. 因为后者无法设置真实Log调用者的信息 + tryImplementation("com.fr.third.apache.log4j.Logger", "FRLog4jImpl"); tryImplementation("org.slf4j.Logger", "com.fr.third.alibaba.druid.support.logging.SLF4JImpl"); tryImplementation("org.apache.log4j.Logger", "com.fr.third.alibaba.druid.support.logging.Log4jImpl"); tryImplementation("org.apache.logging.log4j.Logger", "com.fr.third.alibaba.druid.support.logging.Log4j2Impl");