You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2016/04/26 15:44:28 UTC
logging-log4j2 git commit: LOG4J2-494 - Update documentation and
changes.xml
Repository: logging-log4j2
Updated Branches:
refs/heads/master d1a737532 -> 91aba0063
LOG4J2-494 - Update documentation and changes.xml
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/91aba006
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/91aba006
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/91aba006
Branch: refs/heads/master
Commit: 91aba006378c7bdd59fcdc87be87356f88358232
Parents: d1a7375
Author: Ralph Goers <rg...@nextiva.com>
Authored: Tue Apr 26 06:44:16 2016 -0700
Committer: Ralph Goers <rg...@nextiva.com>
Committed: Tue Apr 26 06:44:16 2016 -0700
----------------------------------------------------------------------
src/changes/changes.xml | 3 +++
src/site/xdoc/manual/configuration.xml.vm | 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/91aba006/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index bf193a6..c707409 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,6 +24,9 @@
</properties>
<body>
<release version="2.6" date="2016-MM-DD" description="GA Release 2.6">
+ <action issue="LOG4J2-494" dev="rgoers" type="add" due-to="Philipp Knobel">
+ Support mergiing configurations to for a composite configuration.
+ </action>
<action issue="LOG4J2-1357" dev="mikes" type="add">
Option to not log stacktraces for logged Throwables in GelfLayout.
</action>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/91aba006/src/site/xdoc/manual/configuration.xml.vm
----------------------------------------------------------------------
diff --git a/src/site/xdoc/manual/configuration.xml.vm b/src/site/xdoc/manual/configuration.xml.vm
index 11e5c11..4b2761d 100644
--- a/src/site/xdoc/manual/configuration.xml.vm
+++ b/src/site/xdoc/manual/configuration.xml.vm
@@ -1242,7 +1242,9 @@ rootLogger.appenderRef.stdout.ref = STDOUT
<subsection name="Composite Configuration">
<p>
Log4j allows multiple configuration files to be used by specifying them as a list of comma separated
- file paths on log4j.configurationFile. When this is done Log4j will merge the files using the following rules.
+ file paths on log4j.configurationFile. The merge logic can be controlled by specifying a class
+ that implements the MergeStrategy interface on the log4j.mergeStrategy property. The default
+ merge strategy will merge the files using the following rules:
<ol>
<li>The global configuration attributes are aggregated with those in later configurations replacing
those in previous configurations, with the exception that the highest status level and the lowest