LOG4J2-1172 AsyncLoggers now update their nanoClock when the configuration changes
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/09ef47a5 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/09ef47a5 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/09ef47a5 Branch: refs/heads/LOG4J2-89 Commit: 09ef47a5f137030b8ec09e1dff21dec6c3e01f45 Parents: bb161e2 Author: rpopma <[email protected]> Authored: Wed Nov 11 18:32:52 2015 +0900 Committer: Ralph Goers <[email protected]> Committed: Fri Nov 20 17:39:22 2015 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/logging/log4j/core/LoggerContext.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/09ef47a5/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java index 8de0025..f2ae53b 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java @@ -29,7 +29,6 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.core.async.AsyncLogger; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.config.ConfigurationListener; @@ -506,8 +505,9 @@ public class LoggerContext extends AbstractLifeCycle implements org.apache.loggi // LOG4J2-716: Android has no java.lang.management LOGGER.error("Could not reconfigure JMX", t); } + // AsyncLoggers update their nanoClock when the configuration changes Log4jLogEvent.setNanoClock(NanoClockFactory.createNanoClock()); - AsyncLogger.setNanoClock(NanoClockFactory.createNanoClock()); + return prev; } finally { configLock.unlock();
