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 2015/02/22 12:53:26 UTC

[1/3] logging-log4j2 git commit: LOG4J2-955 switched two paragraphs

Repository: logging-log4j2
Updated Branches:
  refs/heads/master 84b55aa7d -> e27c5b5ba


LOG4J2-955 switched two paragraphs

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d13b9812
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d13b9812
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d13b9812

Branch: refs/heads/master
Commit: d13b981280203b6202e4744052c8c797c5e199d0
Parents: e78b1c0
Author: rpopma <rp...@apache.org>
Authored: Fri Feb 20 01:48:55 2015 +0900
Committer: rpopma <rp...@apache.org>
Committed: Fri Feb 20 01:48:55 2015 +0900

----------------------------------------------------------------------
 src/site/xdoc/faq.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d13b9812/src/site/xdoc/faq.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/faq.xml b/src/site/xdoc/faq.xml
index f65c875..a078c00 100644
--- a/src/site/xdoc/faq.xml
+++ b/src/site/xdoc/faq.xml
@@ -98,8 +98,6 @@
         for a configuration file named <code>log4j2.xml</code> on the classpath. Note the "2" in the file name!
         (See the <a href="manual/configuration.html#AutomaticConfiguration">configuration manual page</a>
         for more details.)</p>
-        <p>Enable log4j2 internal status logging by setting system property 
-          <code>-Dorg.apache.logging.log4j.simplelog.StatusLogger.level=TRACE</code>.</p>
         <p>If the configuration file is found correctly, log4j2 internal status logging can be controlled by
         setting <code>&lt;Configuration status="trace"&gt;</code> in the configuration file.
         This will display detailed log4j2-internal
@@ -107,6 +105,9 @@
         This may be useful to trouble-shoot configuration issues.
         By default the status logger level is WARN, so you only see notifications when there is a problem.
         </p>
+        <p>If the configuration file is not found correctly, you can still enable 
+        log4j2 internal status logging by setting system property 
+          <code>-Dorg.apache.logging.log4j.simplelog.StatusLogger.level=TRACE</code>.</p>
 
 		<a name="separate_log_files" />
         <h4>How do I dynamically write to separate log files?</h4>


[3/3] logging-log4j2 git commit: LOG4J2-938: make Executor thread a daemon thread

Posted by rp...@apache.org.
LOG4J2-938: make Executor thread a daemon thread

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e27c5b5b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e27c5b5b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e27c5b5b

Branch: refs/heads/master
Commit: e27c5b5bae87a6fb06cafafac7fd9dd8a5e49a1f
Parents: af0c8ce
Author: rpopma <rp...@apache.org>
Authored: Sun Feb 22 20:53:28 2015 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sun Feb 22 20:53:28 2015 +0900

----------------------------------------------------------------------
 .../apache/logging/log4j/core/jmx/Server.java   | 33 ++++++++------------
 1 file changed, 13 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e27c5b5b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java
index 90ae02b..92a19a3 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java
@@ -36,6 +36,7 @@ import org.apache.logging.log4j.core.appender.AsyncAppender;
 import org.apache.logging.log4j.core.async.AsyncLogger;
 import org.apache.logging.log4j.core.async.AsyncLoggerConfig;
 import org.apache.logging.log4j.core.async.AsyncLoggerContext;
+import org.apache.logging.log4j.core.async.DaemonThreadFactory;
 import org.apache.logging.log4j.core.config.LoggerConfig;
 import org.apache.logging.log4j.core.impl.Log4jContextFactory;
 import org.apache.logging.log4j.core.selector.ContextSelector;
@@ -46,31 +47,27 @@ import org.apache.logging.log4j.util.PropertiesUtil;
 /**
  * Creates MBeans to instrument various classes in the log4j class hierarchy.
  * <p>
- * All instrumentation for Log4j 2 classes can be disabled by setting system
- * property {@code -Dlog4j2.disable.jmx=true}.
+ * All instrumentation for Log4j 2 classes can be disabled by setting system property {@code -Dlog4j2.disable.jmx=true}.
  * </p>
  */
 public final class Server {
 
     /**
-     * The domain part, or prefix ({@value} ) of the {@code ObjectName} of all
-     * MBeans that instrument Log4J2 components.
+     * The domain part, or prefix ({@value} ) of the {@code ObjectName} of all MBeans that instrument Log4J2 components.
      */
     public static final String DOMAIN = "org.apache.logging.log4j2";
     private static final String PROPERTY_DISABLE_JMX = "log4j2.disable.jmx";
     private static final StatusLogger LOGGER = StatusLogger.getLogger();
-    static final Executor executor = Executors.newFixedThreadPool(1);
+    static final Executor executor = Executors.newFixedThreadPool(1, new DaemonThreadFactory("log4j2.jmx.notif"));
 
     private Server() {
     }
 
     /**
-     * Either returns the specified name as is, or returns a quoted value
-     * containing the specified name with the special characters (comma, equals,
-     * colon, quote, asterisk, or question mark) preceded with a backslash.
+     * Either returns the specified name as is, or returns a quoted value containing the specified name with the special
+     * characters (comma, equals, colon, quote, asterisk, or question mark) preceded with a backslash.
      *
-     * @param name the name to escape so it can be used as a value in an
-     *            {@link ObjectName}.
+     * @param name the name to escape so it can be used as a value in an {@link ObjectName}.
      * @return the escaped name
      */
     public static String escape(final String name) {
@@ -190,11 +187,9 @@ public final class Server {
     }
 
     /**
-     * Returns the {@code ContextSelector} of the current
-     * {@code Log4jContextFactory}.
+     * Returns the {@code ContextSelector} of the current {@code Log4jContextFactory}.
      *
-     * @return the {@code ContextSelector} of the current
-     *         {@code Log4jContextFactory}
+     * @return the {@code ContextSelector} of the current {@code Log4jContextFactory}
      */
     private static ContextSelector getContextSelector() {
         final LoggerContextFactory factory = LogManager.getFactory();
@@ -206,9 +201,8 @@ public final class Server {
     }
 
     /**
-     * Unregisters all MBeans associated with the specified logger context
-     * (including MBeans for {@code LoggerConfig}s and {@code Appender}s from
-     * the platform MBean server.
+     * Unregisters all MBeans associated with the specified logger context (including MBeans for {@code LoggerConfig}s
+     * and {@code Appender}s from the platform MBean server.
      *
      * @param loggerContextName name of the logger context to unregister
      */
@@ -218,9 +212,8 @@ public final class Server {
     }
 
     /**
-     * Unregisters all MBeans associated with the specified logger context
-     * (including MBeans for {@code LoggerConfig}s and {@code Appender}s from
-     * the platform MBean server.
+     * Unregisters all MBeans associated with the specified logger context (including MBeans for {@code LoggerConfig}s
+     * and {@code Appender}s from the platform MBean server.
      *
      * @param contextName name of the logger context to unregister
      * @param mbs the MBean Server to unregister the instrumented objects from


[2/3] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git

Posted by rp...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/af0c8ce8
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/af0c8ce8
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/af0c8ce8

Branch: refs/heads/master
Commit: af0c8ce83693392d1708a1995c20fcaa722cd6f9
Parents: d13b981 84b55aa
Author: rpopma <rp...@apache.org>
Authored: Sun Feb 22 20:34:02 2015 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sun Feb 22 20:34:02 2015 +0900

----------------------------------------------------------------------
 .../src/main/java/org/apache/logging/log4j/Level.java  |  2 +-
 .../org/apache/logging/log4j/core/config/Property.java | 13 +++++++------
 pom.xml                                                |  2 +-
 src/changes/changes.xml                                | 12 ++++++++++++
 src/site/xdoc/manual/appenders.xml                     |  6 +++---
 src/site/xdoc/manual/configuration.xml.vm              |  8 ++++----
 6 files changed, 28 insertions(+), 15 deletions(-)
----------------------------------------------------------------------