Repository: logging-log4j2 Updated Branches: refs/heads/master 7d1f86828 -> 55785c482
Checkstyle: rename field to avoid hidden name warnings. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e0c6403a Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e0c6403a Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e0c6403a Branch: refs/heads/master Commit: e0c6403a80c3812a43c4d74ff2f8402303807ce9 Parents: 7d1f868 Author: ggregory <[email protected]> Authored: Mon Sep 14 13:49:53 2015 -0700 Committer: ggregory <[email protected]> Committed: Mon Sep 14 13:49:53 2015 -0700 ---------------------------------------------------------------------- .../logging/log4j/core/LogEventListener.java | 4 +- .../org/apache/logging/log4j/core/Logger.java | 46 ++++++++++---------- .../logging/log4j/core/async/AsyncLogger.java | 10 ++--- 3 files changed, 30 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e0c6403a/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEventListener.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEventListener.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEventListener.java index 3e46c42..dd93fc3 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEventListener.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEventListener.java @@ -35,8 +35,8 @@ public class LogEventListener implements EventListener { return; } final Logger logger = context.getLogger(event.getLoggerName()); - if (logger.config.filter(event.getLevel(), event.getMarker(), event.getMessage(), event.getThrown())) { - logger.config.logEvent(event); + if (logger.privateConfig.filter(event.getLevel(), event.getMarker(), event.getMessage(), event.getThrown())) { + logger.privateConfig.logEvent(event); } } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e0c6403a/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java index f4ed6e2..486b18b 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java @@ -53,7 +53,7 @@ public class Logger extends AbstractLogger { /** * Config should be consistent across threads. */ - protected volatile PrivateConfig config; + protected volatile PrivateConfig privateConfig; // FIXME: ditto to the above private final LoggerContext context; @@ -67,7 +67,7 @@ public class Logger extends AbstractLogger { protected Logger(final LoggerContext context, final String name, final MessageFactory messageFactory) { super(name, messageFactory); this.context = context; - config = new PrivateConfig(context.getConfiguration(), this); + privateConfig = new PrivateConfig(context.getConfiguration(), this); } /** @@ -76,8 +76,8 @@ public class Logger extends AbstractLogger { * @return The parent Logger. */ public Logger getParent() { - final LoggerConfig lc = config.loggerConfig.getName().equals(getName()) ? config.loggerConfig.getParent() : - config.loggerConfig; + final LoggerConfig lc = privateConfig.loggerConfig.getName().equals(getName()) ? privateConfig.loggerConfig.getParent() : + privateConfig.loggerConfig; if (lc == null) { return null; } @@ -112,41 +112,41 @@ public class Logger extends AbstractLogger { actualLevel = level; } else { final Logger parent = getParent(); - actualLevel = parent != null ? parent.getLevel() : config.level; + actualLevel = parent != null ? parent.getLevel() : privateConfig.level; } - config = new PrivateConfig(config, actualLevel); + privateConfig = new PrivateConfig(privateConfig, actualLevel); } @Override public void logMessage(final String fqcn, final Level level, final Marker marker, final Message message, final Throwable t) { final Message msg = message == null ? new SimpleMessage(Strings.EMPTY) : message; - config.config.getConfigurationMonitor().checkConfiguration(); - config.loggerConfig.log(getName(), fqcn, marker, level, msg, t); + privateConfig.config.getConfigurationMonitor().checkConfiguration(); + privateConfig.loggerConfig.log(getName(), fqcn, marker, level, msg, t); } @Override public boolean isEnabled(final Level level, final Marker marker, final String message, final Throwable t) { - return config.filter(level, marker, message, t); + return privateConfig.filter(level, marker, message, t); } @Override public boolean isEnabled(final Level level, final Marker marker, final String message) { - return config.filter(level, marker, message); + return privateConfig.filter(level, marker, message); } @Override public boolean isEnabled(final Level level, final Marker marker, final String message, final Object... params) { - return config.filter(level, marker, message, params); + return privateConfig.filter(level, marker, message, params); } @Override public boolean isEnabled(final Level level, final Marker marker, final Object message, final Throwable t) { - return config.filter(level, marker, message, t); + return privateConfig.filter(level, marker, message, t); } @Override public boolean isEnabled(final Level level, final Marker marker, final Message message, final Throwable t) { - return config.filter(level, marker, message, t); + return privateConfig.filter(level, marker, message, t); } /** @@ -154,7 +154,7 @@ public class Logger extends AbstractLogger { * @param appender The Appender to add to the Logger. */ public void addAppender(final Appender appender) { - config.config.addLoggerAppender(this, appender); + privateConfig.config.addLoggerAppender(this, appender); } /** @@ -162,7 +162,7 @@ public class Logger extends AbstractLogger { * @param appender The Appender to remove from the Logger. */ public void removeAppender(final Appender appender) { - config.loggerConfig.removeAppender(appender.getName()); + privateConfig.loggerConfig.removeAppender(appender.getName()); } /** @@ -170,7 +170,7 @@ public class Logger extends AbstractLogger { * @return A Map containing the Appender's name as the key and the Appender as the value. */ public Map<String, Appender> getAppenders() { - return config.loggerConfig.getAppenders(); + return privateConfig.loggerConfig.getAppenders(); } /** @@ -179,7 +179,7 @@ public class Logger extends AbstractLogger { */ // FIXME: this really ought to be an Iterable instead of an Iterator public Iterator<Filter> getFilters() { - final Filter filter = config.loggerConfig.getFilter(); + final Filter filter = privateConfig.loggerConfig.getFilter(); if (filter == null) { return new ArrayList<Filter>().iterator(); } else if (filter instanceof CompositeFilter) { @@ -198,7 +198,7 @@ public class Logger extends AbstractLogger { */ @Override public Level getLevel() { - return config.level; + return privateConfig.level; } /** @@ -206,7 +206,7 @@ public class Logger extends AbstractLogger { * @return The number of Filters associated with the Logger. */ public int filterCount() { - final Filter filter = config.loggerConfig.getFilter(); + final Filter filter = privateConfig.loggerConfig.getFilter(); if (filter == null) { return 0; } else if (filter instanceof CompositeFilter) { @@ -220,7 +220,7 @@ public class Logger extends AbstractLogger { * @param filter The Filter to add. */ public void addFilter(final Filter filter) { - config.config.addLoggerFilter(this, filter); + privateConfig.config.addLoggerFilter(this, filter); } /** @@ -229,7 +229,7 @@ public class Logger extends AbstractLogger { * @return true if the associated LoggerConfig is additive, false otherwise. */ public boolean isAdditive() { - return config.loggerConfig.isAdditive(); + return privateConfig.loggerConfig.isAdditive(); } /** @@ -238,7 +238,7 @@ public class Logger extends AbstractLogger { * @param additive Boolean value to indicate whether the Logger is additive or not. */ public void setAdditive(final boolean additive) { - config.config.setLoggerAdditive(this, additive); + privateConfig.config.setLoggerAdditive(this, additive); } /** @@ -254,7 +254,7 @@ public class Logger extends AbstractLogger { * @param newConfig The new Configuration. */ protected void updateConfiguration(final Configuration newConfig) { - this.config = new PrivateConfig(newConfig, this); + this.privateConfig = new PrivateConfig(newConfig, this); } /** http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e0c6403a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java index cc1e101..927e80b 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java @@ -284,7 +284,7 @@ public class AsyncLogger extends Logger { final String fqcn, final Level level, final Marker marker, final Message message, final Throwable thrown) { if (info.isAppenderThread && theDisruptor.getRingBuffer().remainingCapacity() == 0) { // bypass RingBuffer and invoke Appender directly - config.loggerConfig.log(getName(), fqcn, marker, level, message, thrown); + privateConfig.loggerConfig.log(getName(), fqcn, marker, level, message, thrown); return true; } return false; @@ -353,7 +353,7 @@ public class AsyncLogger extends Logger { * @return the caller location if requested, {@code null} otherwise. */ private StackTraceElement calcLocationIfRequested(String fqcn) { - final boolean includeLocation = config.loggerConfig.isIncludeLocation(); + final boolean includeLocation = privateConfig.loggerConfig.isIncludeLocation(); return includeLocation ? location(fqcn) : null; } @@ -380,9 +380,9 @@ public class AsyncLogger extends Logger { * @param event the event to log */ public void actualAsyncLog(final RingBufferLogEvent event) { - final Map<Property, Boolean> properties = config.loggerConfig.getProperties(); - event.mergePropertiesIntoContextMap(properties, config.config.getStrSubstitutor()); - config.logEvent(event); + final Map<Property, Boolean> properties = privateConfig.loggerConfig.getProperties(); + event.mergePropertiesIntoContextMap(properties, privateConfig.config.getStrSubstitutor()); + privateConfig.logEvent(event); } public static void stop() {
