Repository: logging-log4j2 Updated Branches: refs/heads/LOG4J2-1528 634df7cc1 -> 244b79b36
Fix CustomLevel 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/f7298ce5 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f7298ce5 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f7298ce5 Branch: refs/heads/LOG4J2-1528 Commit: f7298ce5999588973fbbf1d602ff4777acd3cbc6 Parents: 520170c Author: Mikael Ståldal <mik...@staldal.nu> Authored: Sun Aug 21 19:13:30 2016 +0200 Committer: Mikael Ståldal <mik...@staldal.nu> Committed: Sun Aug 21 19:13:30 2016 +0200 ---------------------------------------------------------------------- .../builder/impl/DefaultCustomLevelComponentBuilder.java | 2 +- .../core/config/builder/ConfigurationAssemblerTest.java | 8 ++++++++ .../core/config/builder/CustomConfigurationFactory.java | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f7298ce5/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCustomLevelComponentBuilder.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCustomLevelComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCustomLevelComponentBuilder.java index 4ef25e6..d3c86f5 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCustomLevelComponentBuilder.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultCustomLevelComponentBuilder.java @@ -28,6 +28,6 @@ class DefaultCustomLevelComponentBuilder extends DefaultComponentAndConfiguratio public DefaultCustomLevelComponentBuilder(final DefaultConfigurationBuilder<? extends Configuration> builder, final String name, final int level) { super(builder, name, "CustomLevel"); - addAttribute("level", Integer.toString(level)); + addAttribute("intLevel", level); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f7298ce5/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java index 61ce701..f9e2d2d 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java @@ -21,6 +21,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import java.util.List; import java.util.Map; import org.apache.logging.log4j.LogManager; @@ -32,6 +33,7 @@ import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.config.Configurator; +import org.apache.logging.log4j.core.config.CustomLevelConfig; import org.apache.logging.log4j.core.config.LoggerConfig; import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilder; import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilderFactory; @@ -81,6 +83,12 @@ public class ConfigurationAssemblerTest { final Filter filter = config.getFilter(); assertNotNull("No Filter", filter); assertTrue("Not a Threshold Filter", filter instanceof ThresholdFilter); + final List<CustomLevelConfig> customLevels = config.getCustomLevels(); + assertNotNull("No CustomLevels", filter); + assertEquals(1, customLevels.size()); + CustomLevelConfig customLevel = customLevels.get(0); + assertEquals("Panic", customLevel.getLevelName()); + assertEquals(17, customLevel.getIntLevel()); final Logger logger = LogManager.getLogger(getClass()); logger.info("Welcome to Log4j!"); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f7298ce5/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/CustomConfigurationFactory.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/CustomConfigurationFactory.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/CustomConfigurationFactory.java index cd65bfb..519888c 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/CustomConfigurationFactory.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/CustomConfigurationFactory.java @@ -52,6 +52,7 @@ public class CustomConfigurationFactory extends ConfigurationFactory { add(builder.newAppenderRef("Stdout")). addAttribute("additivity", false)); builder.add(builder.newRootLogger(Level.ERROR).add(builder.newAppenderRef("Stdout"))); + builder.add(builder.newCustomLevel("Panic", 17)); return builder.build(); }
