You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/05/22 15:11:22 UTC
logging-log4j2 git commit: Revert the lock-free labelling based on
feedback from mechanical-sympathy mailing list.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 93acc51ba -> 9b69057fb
Revert the lock-free labelling based on feedback from mechanical-sympathy mailing list.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/9b69057f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/9b69057f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/9b69057f
Branch: refs/heads/master
Commit: 9b69057fb6ce64b68cf3cc8c7e1daf08ef6a4150
Parents: 93acc51
Author: rpopma <rp...@apache.org>
Authored: Mon May 23 00:12:00 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Mon May 23 00:12:00 2016 +0900
----------------------------------------------------------------------
src/site/pdf.xml | 2 +-
src/site/site.xml | 2 +-
src/site/xdoc/index.xml | 2 +-
src/site/xdoc/manual/async.xml | 4 ++--
src/site/xdoc/manual/index.xml | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9b69057f/src/site/pdf.xml
----------------------------------------------------------------------
diff --git a/src/site/pdf.xml b/src/site/pdf.xml
index ec6fbfd..59b6442 100644
--- a/src/site/pdf.xml
+++ b/src/site/pdf.xml
@@ -38,7 +38,7 @@
<item name="Appenders" ref="/manual/appenders.xml"/>
<item name="Layouts" ref="/manual/layouts.xml.vm"/>
<item name="Filters" ref="/manual/filters.xml"/>
- <item name="Lock-free Async Loggers" ref="/manual/async.xml" />
+ <item name="Async Loggers" ref="/manual/async.xml" />
<item name="Garbage-free Logging" ref="/manual/garbagefree.xml"/>
<item name="JMX" ref="/manual/jmx.xml.vm"/>
<item name="Logging Separation" ref="/manual/logsep.xml"/>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9b69057f/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 68618e3..286b459 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -170,7 +170,7 @@
<item name="Time" href="/manual/filters.html#TimeFilter"/>
</item>
- <item name="Lock-free Async Loggers" href="/manual/async.html" collapse="true">
+ <item name="Async Loggers" href="/manual/async.html" collapse="true">
<item name="Trade-offs" href="/manual/async.html#Trade-offs"/>
<item name="All Loggers Async" href="/manual/async.html#AllAsync"/>
<item name="Mixed Sync & Async" href="/manual/async.html#MixedSync-Async"/>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9b69057f/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 7b29ede..cb5fb34 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -46,7 +46,7 @@
</dd>
<dt>Improved Performance</dt>
<dd>
- Log4j 2 contains next-generation lock-free Asynchronous Loggers based
+ Log4j 2 contains next-generation Asynchronous Loggers based
on the LMAX Disruptor library. In multi-threaded scenarios
Asynchronous Loggers have 18 times higher throughput and
orders of magnitude lower latency than Log4j 1.x and Logback.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9b69057f/src/site/xdoc/manual/async.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/manual/async.xml b/src/site/xdoc/manual/async.xml
index b772940..3baf01d 100644
--- a/src/site/xdoc/manual/async.xml
+++ b/src/site/xdoc/manual/async.xml
@@ -16,14 +16,14 @@
<author email="rpopma@apache.org">Remko Popma</author>
</properties>
<body>
- <section name="Lock-free Asynchronous Loggers for Low-Latency Logging">
+ <section name="Asynchronous Loggers for Low-Latency Logging">
<p>
Asynchronous logging can improve your application's performance by executing the I/O operations
in a separate thread. Log4j 2 makes a number of improvements in this area.
</p>
<ul>
<li>
- <b>Lock-free Asynchronous Loggers</b> are a new addition in Log4j 2.
+ <b>Asynchronous Loggers</b> are a new addition in Log4j 2.
Their aim is to return from the call to Logger.log to the application as
soon as possible. You can choose between making all Loggers asynchronous
or using a mixture of synchronous and asynchronous Loggers. Making all
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9b69057f/src/site/xdoc/manual/index.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/manual/index.xml b/src/site/xdoc/manual/index.xml
index 874cfcf..c901763 100644
--- a/src/site/xdoc/manual/index.xml
+++ b/src/site/xdoc/manual/index.xml
@@ -95,7 +95,7 @@
Logback, exceptions in Appenders are never visible to the application. In
Log4j 2 Appenders can be configured to allow the exception to percolate
to the application.</li>
- <li>Log4j 2 contains next-generation <a href="async.html">lock-free Asynchronous Loggers</a> based
+ <li>Log4j 2 contains next-generation <a href="async.html">Asynchronous Loggers</a> based
on the <a href="https://lmax-exchange.github.io/disruptor/">LMAX Disruptor library</a>.
In multi-threaded scenarios Asynchronous Loggers have 10 times higher throughput and
orders of magnitude lower latency than Log4j 1.x and Logback.</li>