Repository: logging-log4j2 Updated Branches: refs/heads/master 82fdc2474 -> 8d4dc1f28
LOG4J2-918 Clarified documentation for combining async with sync loggers. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8d4dc1f2 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8d4dc1f2 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8d4dc1f2 Branch: refs/heads/master Commit: 8d4dc1f28c062d968b2fc6b4432cb6d5d3d4f490 Parents: 82fdc24 Author: rpopma <[email protected]> Authored: Sun Jul 5 14:02:17 2015 +0900 Committer: rpopma <[email protected]> Committed: Sun Jul 5 14:02:17 2015 +0900 ---------------------------------------------------------------------- src/changes/changes.xml | 5 ++++- src/site/xdoc/manual/async.xml | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8d4dc1f2/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index e682373..1ef9568 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -24,7 +24,10 @@ </properties> <body> <release version="2.4" date="2015-MM-DD" description="GA Release 2.4"> - <action issue="LOG4J2=1044" dev="rgoers" type="update"> + <action issue="LOG4J2-918" dev="rpopma" type="fix"> + Clarify documentation for combining async with sync loggers. + </action> + <action issue="LOG4J2-1044" dev="rgoers" type="update"> Support batchSize in FlumeAvroManager. </action> <action issue="LOG4J2-767" dev="ggregory" type="add" due-to="Mikael Ståldal"> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8d4dc1f2/src/site/xdoc/manual/async.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/manual/async.xml b/src/site/xdoc/manual/async.xml index 7b6ee9c..ad74fdb 100644 --- a/src/site/xdoc/manual/async.xml +++ b/src/site/xdoc/manual/async.xml @@ -281,7 +281,11 @@ This gives you more flexibility at the cost of a slight loss in performance (compared to making all loggers asynchronous). Use the <tt><asyncRoot></tt> or <tt><asyncLogger></tt> configuration elements to specify the loggers that need to be asynchronous. - The same configuration file can also contain <tt><root></tt> and + A configuration can contain only one root logger (either a <tt><root></tt> + or an <tt><asyncRoot></tt> element), but otherwise async and non-async loggers may be + combined. + For example, a configuration file containing <tt><asyncLogger></tt> elements + can also contain <tt><root></tt> and <tt><logger></tt> elements for the synchronous loggers. </p> <p>
