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 2014/06/15 07:39:45 UTC
svn commit: r1602656 - in
/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core:
./ async/ config/ config/json/ config/xml/ impl/
Author: rpopma
Date: Sun Jun 15 05:39:44 2014
New Revision: 1602656
URL: http://svn.apache.org/r1602656
Log:
configuration status log improvements
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java?rev=1602656&r1=1602655&r2=1602656&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java Sun Jun 15 05:39:44 2014
@@ -393,7 +393,7 @@ public class LoggerContext extends Abstr
* Reconfigure the context.
*/
public synchronized void reconfigure() {
- LOGGER.debug("Reconfiguration started for context {}", name);
+ LOGGER.debug("Reconfiguration started for context[name={}] at {}", name, configLocation);
final Configuration instance = ConfigurationFactory.getInstance().getConfiguration(name, configLocation);
setConfiguration(instance);
/*
@@ -401,7 +401,7 @@ public class LoggerContext extends Abstr
* updateLoggers(); if (old != null) { old.stop(); }
*/
- LOGGER.debug("Reconfiguration completed");
+ LOGGER.debug("Reconfiguration complete for context[name={}] at {}", name, configLocation);
}
/**
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java?rev=1602656&r1=1602655&r2=1602656&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java Sun Jun 15 05:39:44 2014
@@ -120,6 +120,7 @@ public class AsyncLoggerConfig extends L
@Override
public void start() {
+ LOGGER.trace("AsyncLoggerConfig[{}] starting...", getName());
this.setStarting();
if (helper == null) {
helper = new AsyncLoggerConfigHelper(this);
@@ -131,6 +132,7 @@ public class AsyncLoggerConfig extends L
@Override
public void stop() {
+ LOGGER.trace("AsyncLoggerConfig[{}] stopping...", getName());
this.setStopping();
AsyncLoggerConfigHelper.release();
super.stop();
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java?rev=1602656&r1=1602655&r2=1602656&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java Sun Jun 15 05:39:44 2014
@@ -131,6 +131,7 @@ public abstract class AbstractConfigurat
*/
@Override
public void start() {
+ LOGGER.debug("Starting configuration {}", this);
this.setStarting();
pluginManager.collectPlugins();
final PluginManager levelPlugins = new PluginManager("Level");
@@ -158,6 +159,7 @@ public abstract class AbstractConfigurat
}
root.start(); // LOG4J2-336
super.start();
+ LOGGER.debug("Started configuration {} OK.", this);
}
/**
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java?rev=1602656&r1=1602655&r2=1602656&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java Sun Jun 15 05:39:44 2014
@@ -245,6 +245,12 @@ public class JsonConfiguration extends A
}
}
}
+
+ @Override
+ public String toString() {
+ final String path = configFile != null ? configFile.getAbsolutePath() : "unknown";
+ return getClass().getSimpleName() + "[location=" + path + "]";
+ }
/**
* The error that occurred.
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java?rev=1602656&r1=1602655&r2=1602656&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java Sun Jun 15 05:39:44 2014
@@ -318,6 +318,12 @@ public class XmlConfiguration extends Ab
}
return attributes;
}
+
+ @Override
+ public String toString() {
+ final String path = configFile != null ? configFile.getAbsolutePath() : "unknown";
+ return getClass().getSimpleName() + "[location=" + path + "]";
+ }
/**
* The error that occurred.
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java?rev=1602656&r1=1602655&r2=1602656&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java Sun Jun 15 05:39:44 2014
@@ -96,6 +96,7 @@ public class Log4jContextFactory impleme
if (source != null) {
ContextAnchor.THREAD_CONTEXT.set(ctx);
final Configuration config = ConfigurationFactory.getInstance().getConfiguration(source);
+ LOGGER.debug("Starting LoggerContext[name={}] from configuration {}", ctx.getName(), source);
ctx.start(config);
ContextAnchor.THREAD_CONTEXT.remove();
} else {
@@ -126,6 +127,7 @@ public class Log4jContextFactory impleme
if (configLocation != null || name != null) {
ContextAnchor.THREAD_CONTEXT.set(ctx);
final Configuration config = ConfigurationFactory.getInstance().getConfiguration(name, configLocation);
+ LOGGER.debug("Starting LoggerContext[name={}] from configuration at {}", ctx.getName(), configLocation);
ctx.start(config);
ContextAnchor.THREAD_CONTEXT.remove();
} else {