Repository: logging-log4j2 Updated Branches: refs/heads/master 9bfba8c34 -> c350c93cf
[LOG4J2-976] KeyStoreConfiguration.createKeyStoreConfiguration() ignores keyManagerFactoryAlgorithm. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c350c93c Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c350c93c Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c350c93c Branch: refs/heads/master Commit: c350c93cf95fd73ce3f49be0de7fc212802e0599 Parents: 9bfba8c Author: Gary Gregory <[email protected]> Authored: Mon Mar 16 15:44:38 2015 -0700 Committer: Gary Gregory <[email protected]> Committed: Mon Mar 16 15:44:38 2015 -0700 ---------------------------------------------------------------------- .../log4j/core/config/yaml/YamlConfiguration.java | 16 ++++++++++++++++ src/changes/changes.xml | 5 ++++- 2 files changed, 20 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c350c93c/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfiguration.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfiguration.java index cbf18e7..b8d529d 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfiguration.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfiguration.java @@ -16,6 +16,9 @@ */ package org.apache.logging.log4j.core.config.yaml; +import java.io.IOException; + +import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.ConfigurationSource; import org.apache.logging.log4j.core.config.json.JsonConfiguration; @@ -36,4 +39,17 @@ public class YamlConfiguration extends JsonConfiguration { return new ObjectMapper(new YAMLFactory()).configure(JsonParser.Feature.ALLOW_COMMENTS, true); } + @Override + public Configuration reconfigure() { + try { + final ConfigurationSource source = getConfigurationSource().resetInputStream(); + if (source == null) { + return null; + } + return new YamlConfiguration(source); + } catch (final IOException ex) { + LOGGER.error("Cannot locate file {}", getConfigurationSource(), ex); + } + return null; + } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c350c93c/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index d11b330..485f29b 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -27,9 +27,12 @@ <action issue="LOG4J2-926" dev="ggregory" type="add" due-to="David Ohana"> Truncate from the end of text format modifier. </action> - <action issue="LOG4J2-966" dev="ggregory" type="fix" due-to="Gary Gregory"> + <action issue="LOG4J2-976" dev="ggregory" type="fix" due-to="Matt Quinn"> KeyStoreConfiguration.createKeyStoreConfiguration() ignores keyManagerFactoryAlgorithm. </action> + <action issue="LOG4J2-966" dev="ggregory" type="fix" due-to="Gary Gregory"> + Using monitorInterval with YAML config file format causes JSONParseException. + </action> <action issue="LOG4J2-964" dev="ggregory" type="fix" due-to="Jonne Jyrylä"> StringFormattedMessage serialization is incorrect. </action>
