Remove TODO for includeLocation on Loggers in ConfigurationBuilder
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4ae1cc24 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4ae1cc24 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4ae1cc24 Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure Commit: 4ae1cc24579dcb4afc9e25024d6e86bc84791600 Parents: 090d63a Author: Mikael Ståldal <[email protected]> Authored: Sun Aug 21 20:16:42 2016 +0200 Committer: Mikael Ståldal <[email protected]> Committed: Sun Aug 21 20:16:42 2016 +0200 ---------------------------------------------------------------------- .../apache/logging/log4j/core/config/AbstractConfiguration.java | 2 +- .../core/config/builder/impl/DefaultConfigurationBuilder.java | 2 +- .../log4j/core/config/builder/ConfigurationBuilderTest.java | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4ae1cc24/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java index 68f88d1..49a401b 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java @@ -265,7 +265,7 @@ public abstract class AbstractConfiguration extends AbstractFilterable implement } writeXmlSection(xmlWriter, lookupSection("Appenders")); - writeXmlSection(xmlWriter, lookupSection("Loggers")); // TODO includeLocation on loggers + writeXmlSection(xmlWriter, lookupSection("Loggers")); xmlWriter.writeEndElement(); // "Configuration" xmlWriter.writeCharacters(System.lineSeparator()); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4ae1cc24/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 db06046..7bbb5fa 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 @@ -264,7 +264,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement writeXmlSection(xmlWriter, filters); } writeXmlSection(xmlWriter, appenders); - writeXmlSection(xmlWriter, loggers); // TODO includeLocation on loggers + writeXmlSection(xmlWriter, loggers); xmlWriter.writeEndElement(); // "Configuration" xmlWriter.writeCharacters(System.lineSeparator()); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4ae1cc24/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java index c975e01..3525125 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java @@ -42,10 +42,9 @@ public class ConfigurationBuilderTest { appenderBuilder.add(builder.newFilter("MarkerFilter", Filter.Result.DENY, Filter.Result.NEUTRAL).addAttribute("marker", "FLOW")); builder.add(appenderBuilder); - builder.add(builder.newLogger("org.apache.logging.log4j", Level.DEBUG). + builder.add(builder.newLogger("org.apache.logging.log4j", Level.DEBUG, true). add(builder.newAppenderRef("Stdout")). - addAttribute("additivity", false). - addAttribute("includeLocation", true)); + addAttribute("additivity", false)); builder.add(builder.newRootLogger(Level.ERROR).add(builder.newAppenderRef("Stdout"))); builder.addProperty("MyKey", "MyValue"); builder.add(builder.newCustomLevel("Panic", 17));
