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 2018/10/20 05:46:06 UTC
logging-log4j2 git commit: [LOG4J2-2457]
RollingRandomAccessFileManager ignores new file patterns from programmatic
reconfiguration.
Repository: logging-log4j2
Updated Branches:
refs/heads/release-2.x 8c8657e9d -> 8999e33ef
[LOG4J2-2457] RollingRandomAccessFileManager ignores new file patterns
from programmatic reconfiguration.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8999e33e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8999e33e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8999e33e
Branch: refs/heads/release-2.x
Commit: 8999e33ef2eef6b9a204c944d6682a47bfe0e57e
Parents: 8c8657e
Author: Gary Gregory <ga...@gmail.com>
Authored: Fri Oct 19 23:46:03 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Fri Oct 19 23:46:03 2018 -0600
----------------------------------------------------------------------
.../rolling/RollingRandomAccessFileManager.java | 12 ++++++++----
src/changes/changes.xml | 3 +++
2 files changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8999e33e/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java
index ccbb1a3..affb809 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java
@@ -304,15 +304,18 @@ public class RollingRandomAccessFileManager extends RollingFileManager {
this.fileGroup = fileGroup;
}
- public TriggeringPolicy getTriggeringPolicy()
- {
+ public String getPattern() {
+ return pattern;
+ }
+
+ public TriggeringPolicy getTriggeringPolicy() {
return this.policy;
}
- public RolloverStrategy getRolloverStrategy()
- {
+ public RolloverStrategy getRolloverStrategy() {
return this.strategy;
}
+
}
@Override
@@ -320,5 +323,6 @@ public class RollingRandomAccessFileManager extends RollingFileManager {
final FactoryData factoryData = (FactoryData) data;
setRolloverStrategy(factoryData.getRolloverStrategy());
setTriggeringPolicy(factoryData.getTriggeringPolicy());
+ setPatternProcessor(new PatternProcessor(factoryData.getPattern(), getPatternProcessor()));
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8999e33e/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index f79138d..ebf0b46 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -94,6 +94,9 @@
<action issue="LOG4J2-2481" dev="ggregory" type="fix">
Avoid NullPointerExceptions in org.apache.logging.log4j.core.config.AbstractConfiguration for null arguments.
</action>
+ <action issue="LOG4J2-2457" dev="ggregory" type="fix" due-to="Heiko Schwanke, Gary Gregory">
+ RollingRandomAccessFileManager ignores new file patterns from programmatic reconfiguration.
+ </action>
</release>
<release version="2.11.1" date="2018-07-22" description="GA Release 2.11.1">
<action issue="LOG4J2-2389" dev="rgoers" type="fix" due-to="Liu Wen">