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 2017/08/22 22:19:22 UTC
logging-log4j2 git commit: [LOG4J2-2009] Rolling appender managers
broken on pattern/policy reconfiguration. Refactor common code.
Repository: logging-log4j2
Updated Branches:
refs/heads/master b62e627a8 -> d1283143d
[LOG4J2-2009] Rolling appender managers broken on pattern/policy
reconfiguration. Refactor common code.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d1283143
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d1283143
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d1283143
Branch: refs/heads/master
Commit: d1283143d9702a573561a54a702310a7f3d0b3d7
Parents: b62e627
Author: Gary Gregory <ga...@gmail.com>
Authored: Tue Aug 22 16:19:19 2017 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Tue Aug 22 16:19:19 2017 -0600
----------------------------------------------------------------------
.../RollingFileAppenderUpdateDataTest.java | 30 ++++++--------------
1 file changed, 9 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d1283143/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderUpdateDataTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderUpdateDataTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderUpdateDataTest.java
index 4b80e2e..bff686a 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderUpdateDataTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderUpdateDataTest.java
@@ -36,38 +36,26 @@ import org.junit.Test;
public class RollingFileAppenderUpdateDataTest {
private ConfigurationBuilder<BuiltConfiguration> buildConfigA() {
- final ConfigurationBuilder<BuiltConfiguration> builder = ConfigurationBuilderFactory.newConfigurationBuilder();
- builder.setConfigurationName("LOG4J2-1964 demo");
- builder.setStatusLevel(Level.ERROR);
- // @formatter:off
- builder.add(builder.newAppender("consoleLog", "Console")
- .addAttribute("target", ConsoleAppender.Target.SYSTEM_ERR));
- builder.add(builder.newAppender("fooAppender", "RollingFile")
- .addAttribute("fileName", "foo.log")
- .addAttribute("filePattern", "foo.log.%i")
- .addComponent(builder.newComponent("SizeBasedTriggeringPolicy")
- .addAttribute("size", "10MB")));
- builder.add(builder.newRootLogger(Level.INFO)
- .add(builder.newAppenderRef("consoleLog"))
- .add(builder.newAppenderRef("fooAppender")));
- // @formatter:on
- return builder;
+ return buildConfigurationBuilder("foo.log.%i");
}
// rebuild config with date based rollover
private ConfigurationBuilder<BuiltConfiguration> buildConfigB() {
+ return buildConfigurationBuilder("foo.log.%d{yyyy-MM-dd-HH:mm:ss}.%i");
+ }
+
+ private ConfigurationBuilder<BuiltConfiguration> buildConfigurationBuilder(final String filePattern) {
final ConfigurationBuilder<BuiltConfiguration> builder = ConfigurationBuilderFactory.newConfigurationBuilder();
builder.setConfigurationName("LOG4J2-1964 demo");
builder.setStatusLevel(Level.ERROR);
// @formatter:off
builder.add(builder.newAppender("consoleLog", "Console")
- .addAttribute("target", ConsoleAppender.Target.SYSTEM_ERR));
+ .addAttribute("target", ConsoleAppender.Target.SYSTEM_ERR));
builder.add(builder.newAppender("fooAppender", "RollingFile")
.addAttribute("fileName", "foo.log")
- .addAttribute("filePattern", "foo.log.%d{yyyy-MM-dd-HH:mm:ss}.%i")
- .addComponent(builder.newComponent("TimeBasedTriggeringPolicy")
- .addAttribute("interval", 5)
- .addAttribute("modulate", true)));
+ .addAttribute("filePattern", filePattern)
+ .addComponent(builder.newComponent("SizeBasedTriggeringPolicy")
+ .addAttribute("size", "10MB")));
builder.add(builder.newRootLogger(Level.INFO)
.add(builder.newAppenderRef("consoleLog"))
.add(builder.newAppenderRef("fooAppender")));