You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2019/12/08 05:08:31 UTC
[logging-log4j2] branch release-2.x updated: LOG4J2-2058 - Prevent
recursive calls to getLogger
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/release-2.x by this push:
new 42d0125 LOG4J2-2058 - Prevent recursive calls to getLogger
42d0125 is described below
commit 42d01250823c74c9a25b371ba928deab1a9f62af
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Sat Dec 7 22:08:06 2019 -0700
LOG4J2-2058 - Prevent recursive calls to getLogger
---
.../org/apache/logging/log4j/jul/LogManager.java | 13 +-
.../org/apache/logging/log4j/jul/NoOpLogger.java | 209 +++++++++++++++++++++
2 files changed, 221 insertions(+), 1 deletion(-)
diff --git a/log4j-jul/src/main/java/org/apache/logging/log4j/jul/LogManager.java b/log4j-jul/src/main/java/org/apache/logging/log4j/jul/LogManager.java
index 10f8fdb..f009401 100644
--- a/log4j-jul/src/main/java/org/apache/logging/log4j/jul/LogManager.java
+++ b/log4j-jul/src/main/java/org/apache/logging/log4j/jul/LogManager.java
@@ -20,6 +20,7 @@ import java.util.Collections;
import java.util.Enumeration;
import java.util.logging.Logger;
+import com.sun.org.apache.xpath.internal.operations.Bool;
import org.apache.logging.log4j.LoggingException;
import org.apache.logging.log4j.status.StatusLogger;
import org.apache.logging.log4j.util.LoaderUtil;
@@ -41,6 +42,7 @@ public class LogManager extends java.util.logging.LogManager {
private static final org.apache.logging.log4j.Logger LOGGER = StatusLogger.getLogger();
private final AbstractLoggerAdapter loggerAdapter;
+ private final ThreadLocal<Boolean> recursive = ThreadLocal.withInitial(() -> Boolean.FALSE);
public LogManager() {
super();
@@ -86,7 +88,16 @@ public class LogManager extends java.util.logging.LogManager {
@Override
public Logger getLogger(final String name) {
LOGGER.trace("Call to LogManager.getLogger({})", name);
- return loggerAdapter.getLogger(name);
+ if (recursive.get()) {
+ LOGGER.warn("Recursive call to getLogger for {} ignored.", name);
+ return new NoOpLogger(name);
+ }
+ recursive.set(Boolean.TRUE);
+ try {
+ return loggerAdapter.getLogger(name);
+ } finally {
+ recursive.set(Boolean.FALSE);
+ }
}
@Override
diff --git a/log4j-jul/src/main/java/org/apache/logging/log4j/jul/NoOpLogger.java b/log4j-jul/src/main/java/org/apache/logging/log4j/jul/NoOpLogger.java
new file mode 100644
index 0000000..3c3b158
--- /dev/null
+++ b/log4j-jul/src/main/java/org/apache/logging/log4j/jul/NoOpLogger.java
@@ -0,0 +1,209 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j.jul;
+
+import java.util.ResourceBundle;
+import java.util.function.Supplier;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
+
+/**
+ * Dummy version of a java.util.Logger.
+ */
+public class NoOpLogger extends Logger {
+
+ protected NoOpLogger(String name) {
+ super(name, null);
+ }
+
+ @Override
+ public void log(LogRecord record) {
+ }
+
+ @Override
+ public void log(Level level, String msg) {
+ }
+
+ @Override
+ public void log(Level level, Supplier<String> msgSupplier) {
+ }
+
+ @Override
+ public void log(Level level, String msg, Object param1) {
+ }
+
+ @Override
+ public void log(Level level, String msg, Object[] params) {
+ }
+
+ @Override
+ public void log(Level level, String msg, Throwable thrown) {
+ }
+
+ @Override
+ public void log(Level level, Throwable thrown, Supplier<String> msgSupplier) {
+ }
+
+ @Override
+ public void logp(Level level, String sourceClass, String sourceMethod, String msg) {
+ }
+
+ @Override
+ public void logp(Level level, String sourceClass, String sourceMethod, Supplier<String> msgSupplier) {
+ }
+
+ @Override
+ public void logp(Level level, String sourceClass, String sourceMethod, String msg, Object param1) {
+ }
+
+ @Override
+ public void logp(Level level, String sourceClass, String sourceMethod, String msg, Object[] params) {
+ }
+
+ @Override
+ public void logp(Level level, String sourceClass, String sourceMethod, String msg, Throwable thrown) {
+ }
+
+ @Override
+ public void logp(Level level, String sourceClass, String sourceMethod, Throwable thrown,
+ Supplier<String> msgSupplier) {
+ }
+
+ @Override
+ public void logrb(Level level, String sourceClass, String sourceMethod, String bundleName, String msg) {
+ }
+
+ @Override
+ public void logrb(Level level, String sourceClass, String sourceMethod, String bundleName, String msg,
+ Object param1) {
+ }
+
+ @Override
+ public void logrb(Level level, String sourceClass, String sourceMethod, String bundleName, String msg,
+ Object[] params) {
+ }
+
+ @Override
+ public void logrb(Level level, String sourceClass, String sourceMethod, ResourceBundle bundle, String msg,
+ Object... params) {
+ }
+
+ @Override
+ public void logrb(Level level, String sourceClass, String sourceMethod, String bundleName, String msg,
+ Throwable thrown) {
+ }
+
+ @Override
+ public void logrb(Level level, String sourceClass, String sourceMethod, ResourceBundle bundle, String msg,
+ Throwable thrown) {
+ }
+
+ @Override
+ public void entering(String sourceClass, String sourceMethod) {
+ }
+
+ @Override
+ public void entering(String sourceClass, String sourceMethod, Object param1) {
+ }
+
+ @Override
+ public void entering(String sourceClass, String sourceMethod, Object[] params) {
+ }
+
+ @Override
+ public void exiting(String sourceClass, String sourceMethod) {
+ }
+
+ @Override
+ public void exiting(String sourceClass, String sourceMethod, Object result) {
+ }
+
+ @Override
+ public void throwing(String sourceClass, String sourceMethod, Throwable thrown) {
+ }
+
+ @Override
+ public void severe(String msg) {
+ }
+
+ @Override
+ public void warning(String msg) {
+ }
+
+ @Override
+ public void info(String msg) {
+ }
+
+ @Override
+ public void config(String msg) {
+ }
+
+ @Override
+ public void fine(String msg) {
+ }
+
+ @Override
+ public void finer(String msg) {
+ }
+
+ @Override
+ public void finest(String msg) {
+ }
+
+ @Override
+ public void severe(Supplier<String> msgSupplier) {
+ }
+
+ @Override
+ public void warning(Supplier<String> msgSupplier) {
+ }
+
+ @Override
+ public void info(Supplier<String> msgSupplier) {
+ }
+
+ @Override
+ public void config(Supplier<String> msgSupplier) {
+ }
+
+ @Override
+ public void fine(Supplier<String> msgSupplier) {
+ }
+
+ @Override
+ public void finer(Supplier<String> msgSupplier) {
+ }
+
+ @Override
+ public void finest(Supplier<String> msgSupplier) {
+ }
+
+ @Override
+ public void setLevel(Level newLevel) throws SecurityException {
+ }
+
+ @Override
+ public Level getLevel() {
+ return Level.OFF;
+ }
+
+ @Override
+ public boolean isLoggable(Level level) {
+ return false;
+ }
+}