You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2015/09/24 09:11:35 UTC
logging-log4j2 git commit: Refactor "root" logger config name into a
constant LoggerConfig.ROOT and use it.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 3231ec660 -> 4ae1db954
Refactor "root" logger config name into a constant LoggerConfig.ROOT and
use it.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4ae1db95
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4ae1db95
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4ae1db95
Branch: refs/heads/master
Commit: 4ae1db954c40dc8aaf2639f4bdf005aaaf522d54
Parents: 3231ec6
Author: ggregory <gg...@apache.org>
Authored: Thu Sep 24 00:11:32 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Thu Sep 24 00:11:32 2015 -0700
----------------------------------------------------------------------
.../apache/logging/log4j/core/async/AsyncLoggerConfig.java | 4 ++--
.../org/apache/logging/log4j/core/config/LoggerConfig.java | 8 ++++----
.../config/builder/impl/DefaultConfigurationBuilder.java | 3 ++-
.../logging/log4j/core/config/json/JsonConfiguration.java | 5 +++--
.../config/properties/PropertiesConfigurationFactory.java | 3 ++-
.../org/apache/logging/log4j/core/impl/Log4jLogEvent.java | 3 ++-
.../org/apache/logging/log4j/core/layout/HtmlLayout.java | 3 ++-
7 files changed, 17 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4ae1db95/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
index f87d4e3..1324cbb 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
@@ -122,7 +122,7 @@ public class AsyncLoggerConfig extends LoggerConfig {
}
private String displayName() {
- return LogManager.ROOT_LOGGER_NAME.equals(getName()) ? "root" : getName();
+ return LogManager.ROOT_LOGGER_NAME.equals(getName()) ? LoggerConfig.ROOT : getName();
}
@Override
@@ -193,7 +193,7 @@ public class AsyncLoggerConfig extends LoggerConfig {
levelName);
level = Level.ERROR;
}
- final String name = loggerName.equals("root") ? Strings.EMPTY : loggerName;
+ final String name = loggerName.equals(LoggerConfig.ROOT) ? Strings.EMPTY : loggerName;
final boolean additive = Booleans.parseBoolean(additivity, true);
return new AsyncLoggerConfig(name, appenderRefs, filter, level,
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4ae1db95/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
index 1b1f9e7..98400ce 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
@@ -56,8 +56,8 @@ import org.apache.logging.log4j.util.Strings;
@Plugin(name = "logger", category = Node.CATEGORY, printObject = true)
public class LoggerConfig extends AbstractFilterable {
+ public static final String ROOT = "root";
private static final long serialVersionUID = 1L;
-
private static LogEventFactory LOG_EVENT_FACTORY = null;
private List<AppenderRef> appenderRefs = new ArrayList<>();
@@ -393,7 +393,7 @@ public class LoggerConfig extends AbstractFilterable {
@Override
public String toString() {
- return Strings.isEmpty(name) ? "root" : name;
+ return Strings.isEmpty(name) ? ROOT : name;
}
/**
@@ -422,7 +422,7 @@ public class LoggerConfig extends AbstractFilterable {
}
final List<AppenderRef> appenderRefs = Arrays.asList(refs);
- final String name = loggerName.equals("root") ? Strings.EMPTY : loggerName;
+ final String name = loggerName.equals(ROOT) ? Strings.EMPTY : loggerName;
final boolean additive = Booleans.parseBoolean(additivity, true);
return new LoggerConfig(name, appenderRefs, filter, level, additive, properties, config,
@@ -443,7 +443,7 @@ public class LoggerConfig extends AbstractFilterable {
/**
* The root Logger.
*/
- @Plugin(name = "root", category = "Core", printObject = true)
+ @Plugin(name = ROOT, category = "Core", printObject = true)
public static class RootLogger extends LoggerConfig {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4ae1db95/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
index 38102af..fa886f4 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
@@ -21,6 +21,7 @@ import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.ConfigurationException;
import org.apache.logging.log4j.core.config.ConfigurationSource;
+import org.apache.logging.log4j.core.config.LoggerConfig;
import org.apache.logging.log4j.core.config.builder.api.AppenderComponentBuilder;
import org.apache.logging.log4j.core.config.builder.api.AppenderRefComponentBuilder;
import org.apache.logging.log4j.core.config.builder.api.Component;
@@ -109,7 +110,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
@Override
public ConfigurationBuilder<T> add(final RootLoggerComponentBuilder builder) {
for (final Component c : loggers.getComponents()) {
- if (c.getPluginType().equals("root")) {
+ if (c.getPluginType().equals(LoggerConfig.ROOT)) {
throw new ConfigurationException("Root Logger was previously defined");
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4ae1db95/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java
index 5e70e6a..1fc3e50 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java
@@ -23,6 +23,7 @@ import org.apache.logging.log4j.core.config.AbstractConfiguration;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.ConfigurationSource;
import org.apache.logging.log4j.core.config.FileConfigurationMonitor;
+import org.apache.logging.log4j.core.config.LoggerConfig;
import org.apache.logging.log4j.core.config.Node;
import org.apache.logging.log4j.core.config.Reconfigurable;
import org.apache.logging.log4j.core.config.plugins.util.PluginType;
@@ -202,8 +203,8 @@ public class JsonConfiguration extends AbstractConfiguration implements Reconfig
t = type.getElementName() + ':' + type.getPluginClass();
}
- final String p = node.getParent() == null ? "null" : node.getParent().getName() == null ? "root" : node
- .getParent().getName();
+ final String p = node.getParent() == null ? "null"
+ : node.getParent().getName() == null ? LoggerConfig.ROOT : node.getParent().getName();
LOGGER.debug("Returning {} with parent {} of type {}", node.getName(), p, t);
return node;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4ae1db95/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationFactory.java
index 1dfb19c..5cb6a0c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationFactory.java
@@ -20,6 +20,7 @@ import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.config.ConfigurationException;
import org.apache.logging.log4j.core.config.ConfigurationFactory;
import org.apache.logging.log4j.core.config.ConfigurationSource;
+import org.apache.logging.log4j.core.config.LoggerConfig;
import org.apache.logging.log4j.core.config.Order;
import org.apache.logging.log4j.core.config.builder.api.AppenderComponentBuilder;
import org.apache.logging.log4j.core.config.builder.api.AppenderRefComponentBuilder;
@@ -132,7 +133,7 @@ public class PropertiesConfigurationFactory extends ConfigurationFactory {
String[] loggerNames = loggerProp.split(",");
for (String loggerName : loggerNames) {
String name = loggerName.trim();
- if (!name.equals("root")) {
+ if (!name.equals(LoggerConfig.ROOT)) {
builder.add(
createLogger(builder, name, PropertiesUtil.extractSubset(properties, "logger." + name)));
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4ae1db95/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
index ff4797d..2a350ae 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
@@ -30,6 +30,7 @@ import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.ThreadContext;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.async.RingBufferLogEvent;
+import org.apache.logging.log4j.core.config.LoggerConfig;
import org.apache.logging.log4j.core.config.Property;
import org.apache.logging.log4j.core.util.Clock;
import org.apache.logging.log4j.core.util.ClockFactory;
@@ -617,7 +618,7 @@ public Log4jLogEvent(final String loggerName, final Marker marker, final String
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
- final String n = loggerName.isEmpty() ? "root" : loggerName;
+ final String n = loggerName.isEmpty() ? LoggerConfig.ROOT : loggerName;
sb.append("Logger=").append(n);
sb.append(" Level=").append(level.name());
sb.append(" Message=").append(message.getFormattedMessage());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4ae1db95/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
index 526b33a..a12ee47 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
@@ -30,6 +30,7 @@ import java.util.ArrayList;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.config.LoggerConfig;
import org.apache.logging.log4j.core.config.Node;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
@@ -160,7 +161,7 @@ public final class HtmlLayout extends AbstractStringLayout {
String escapedLogger = Transform.escapeHtmlTags(event.getLoggerName());
if (escapedLogger.isEmpty()) {
- escapedLogger = "root";
+ escapedLogger = LoggerConfig.ROOT;
}
sbuf.append("<td title=\"").append(escapedLogger).append(" logger\">");
sbuf.append(escapedLogger);