From c6939340e1de34b2f914848b1a27020f9d901114 Mon Sep 17 00:00:00 2001 From: ZekerZhayard Date: Sun, 22 Nov 2020 16:19:54 +0800 Subject: [PATCH] Fix log4j2 error with some specific jdk versions. (#83) * Fix log4j2 error with some specific jdk versions. * Fix spigot plugin logger. --- .../arclight/common/mod/util/log/ArclightI18nLogger.java | 7 +------ .../common/mod/util/log/ArclightLazyLogManager.java | 4 ++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/log/ArclightI18nLogger.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/log/ArclightI18nLogger.java index 692227ae..3fa1a42f 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/log/ArclightI18nLogger.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/log/ArclightI18nLogger.java @@ -17,12 +17,7 @@ public class ArclightI18nLogger extends ExtendedLoggerWrapper { } public static Logger getLogger(String name) { - for (int i = 0; i < 10; i++) { - try { - return new ArclightI18nLogger((ExtendedLogger) LogManager.getLogger(name)); - } catch (Throwable ignored) {} - } - throw new IllegalStateException("wtf"); + return new ArclightI18nLogger((ExtendedLogger) LogManager.getLogger(name)); } @Override diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/log/ArclightLazyLogManager.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/log/ArclightLazyLogManager.java index 0edacd95..1280f7b2 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/log/ArclightLazyLogManager.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/util/log/ArclightLazyLogManager.java @@ -18,8 +18,8 @@ public class ArclightLazyLogManager extends LogManager { @Override public Logger getLogger(String name) { tryGet(); - if (delegate != null) return delegate.getLogger(name); - return super.getLogger(name); + if (delegate != null && !"jdk.event.security".equals(name)) return delegate.getLogger(name); + return Logger.getGlobal(); } @Override