You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2016/03/18 18:31:57 UTC
[1/3] logging-log4j2 git commit: Use final.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 0e8d40b0e -> 63d69aed2
Use final.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/49a2f2ce
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/49a2f2ce
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/49a2f2ce
Branch: refs/heads/master
Commit: 49a2f2ce880e927318e1d7afc0120f353c56d555
Parents: 0e8d40b
Author: Matt Sicker <bo...@gmail.com>
Authored: Fri Mar 18 12:12:29 2016 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Fri Mar 18 12:12:29 2016 -0500
----------------------------------------------------------------------
log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/49a2f2ce/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java b/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
index 8c4260b..9b651d6 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
@@ -361,7 +361,7 @@ public class LogManager {
* be used.
* @since 2.6
*/
- public static void shutdown(boolean currentContext) {
+ public static void shutdown(final boolean currentContext) {
shutdown(getContext(currentContext));
}
@@ -374,7 +374,7 @@ public class LogManager {
* @param context the LoggerContext.
* @since 2.6
*/
- public static void shutdown(LoggerContext context) {
+ public static void shutdown(final LoggerContext context) {
if (context != null && context instanceof Terminable) {
((Terminable) context).terminate();
}
[2/3] logging-log4j2 git commit: Add LogManager.shutdown()
alternatives in migration guide
Posted by ma...@apache.org.
Add LogManager.shutdown() alternatives in migration guide
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4ee4e28d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4ee4e28d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4ee4e28d
Branch: refs/heads/master
Commit: 4ee4e28da5d1e7365a399de0489a01abcabcc616
Parents: 49a2f2c
Author: Matt Sicker <bo...@gmail.com>
Authored: Fri Mar 18 12:19:50 2016 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Fri Mar 18 12:19:50 2016 -0500
----------------------------------------------------------------------
src/site/xdoc/manual/migration.xml | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4ee4e28d/src/site/xdoc/manual/migration.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/manual/migration.xml b/src/site/xdoc/manual/migration.xml
index bd05838..37fe516 100644
--- a/src/site/xdoc/manual/migration.xml
+++ b/src/site/xdoc/manual/migration.xml
@@ -72,6 +72,17 @@
Remove calls to <code>org.apache.log4j.LogManager.shutdown()</code>, they are not needed in version 2
because the Log4j Core now automatically adds a JVM shutdown hook on start up to perform any Core
clean ups.
+ <ol>
+ <li>
+ Starting in Log4j 2.1, you can specify a custom
+ <a class="javadoc" href="../log4j-core/apidocs/org/apache/logging/log4j/core/util/ShutdownCallbackRegistry.html">ShutdownCallbackRegistry</a>
+ to override the default JVM shutdown hook strategy.
+ </li>
+ <li>
+ Starting in Log4j 2.6, you can now use <code>org.apache.logging.log4j.LogManager.shutdown()</code>
+ to initiate shutdown manually.
+ </li>
+ </ol>
</li>
<li>
Calls to <code>org.apache.log4j.Logger.setLevel()</code> or similar methods are not supported in the API.
[3/3] logging-log4j2 git commit: LOG4J2-1322 - Update Log4j 1.x
migration guide to include information about system property lookup syntax
changes
Posted by ma...@apache.org.
LOG4J2-1322 - Update Log4j 1.x migration guide to include information about system property lookup syntax changes
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/63d69aed
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/63d69aed
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/63d69aed
Branch: refs/heads/master
Commit: 63d69aed2a6066835d0303e69a8d639763b8ec27
Parents: 4ee4e28
Author: Matt Sicker <bo...@gmail.com>
Authored: Fri Mar 18 12:31:45 2016 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Fri Mar 18 12:31:45 2016 -0500
----------------------------------------------------------------------
src/changes/changes.xml | 3 +++
src/site/xdoc/manual/migration.xml | 13 +++++++++++--
2 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/63d69aed/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 5357d96..cdfabf9 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -220,6 +220,9 @@
<action issue="LOG4J2-1169" dev="mattsicker" type="add" due-to="Gerald Kritzinger">
PatternLayout: Possible variable substitution in equals substitution parameter.
</action>
+ <action issue="LOG4J2-1322" dev="mattsicker" type="update">
+ Update Log4j 1.x migration guide to include information about system property lookup syntax changes.
+ </action>
</release>
<release version="2.5" date="2015-12-06" description="GA Release 2.5">
<action issue="LOG4J2-324" dev="rpopma" type="fix">
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/63d69aed/src/site/xdoc/manual/migration.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/manual/migration.xml b/src/site/xdoc/manual/migration.xml
index 37fe516..4c35c2b 100644
--- a/src/site/xdoc/manual/migration.xml
+++ b/src/site/xdoc/manual/migration.xml
@@ -104,8 +104,17 @@
<subsection name="Configuring Log4j 2">
<p>
Although the Log4j 2 configuration syntax is different than that of Log4j 1.x, most, if not all, of
- the same functionality is available. Below are the example configurations for Log4j 1.x and their
- counterparts in Log4j 2.
+ the same functionality is available.
+ </p>
+ <p>
+ Note that system property interpolation via the <code>${foo}</code> syntax has been extended to allow
+ property lookups from many different sources. See the <a href="lookups.html">Lookups</a> documentation
+ for more details. For example, using a lookup for the system property named <code>catalina.base</code>,
+ in Log4j 1.x, the syntax would be <code>${catalina.base}</code>. In Log4j 2, the syntax would be
+ <code>${sys:catalina.base}</code>.
+ </p>
+ <p>
+ Below are the example configurations for Log4j 1.x and their counterparts in Log4j 2.
</p>
<h4>Sample 1 - Simple configuration using a Console Appender</h4>