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 2014/04/15 09:02:34 UTC
svn commit: r1587454 - in
/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core:
async/AsyncLogger.java config/ConfigurationFactory.java
config/plugins/PluginManager.java net/TLSSocketManager.java
Author: mattsicker
Date: Tue Apr 15 07:02:33 2014
New Revision: 1587454
URL: http://svn.apache.org/r1587454
Log:
Switch to LOGGER.catching(Level.DEBUG, e).
- This changed from TRACE to ERROR at some point, and all these usages were really more of a debug usage than an actual error.
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TLSSocketManager.java
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java?rev=1587454&r1=1587453&r2=1587454&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java Tue Apr 15 07:02:33 2014
@@ -104,7 +104,7 @@ public class AsyncLogger extends Logger
try {
return ThreadNameStrategy.valueOf(name);
} catch (final Exception ex) {
- LOGGER.catching(ex);
+ LOGGER.catching(Level.DEBUG, ex);
return CACHED;
}
}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java?rev=1587454&r1=1587453&r2=1587454&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java Tue Apr 15 07:02:33 2014
@@ -31,6 +31,8 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.TreeSet;
+
+import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.config.plugins.PluginManager;
import org.apache.logging.log4j.core.config.plugins.PluginType;
@@ -286,7 +288,7 @@ public abstract class ConfigurationFacto
return new ConfigurationSource(new FileInputStream(file), file);
} catch (final FileNotFoundException fnfe) {
// Ignore the exception
- LOGGER.catching(fnfe);
+ LOGGER.catching(Level.DEBUG, fnfe);
}
}
return source;
@@ -308,7 +310,7 @@ public abstract class ConfigurationFacto
try {
is = url.openStream();
} catch (final IOException ioe) {
- LOGGER.catching(ioe);
+ LOGGER.catching(Level.DEBUG, ioe);
return null;
}
if (is == null) {
@@ -320,7 +322,7 @@ public abstract class ConfigurationFacto
return new ConfigurationSource(is, FileUtils.fileFromURI(url.toURI()));
} catch (final URISyntaxException ex) {
// Just ignore the exception.
- LOGGER.catching(ex);
+ LOGGER.catching(Level.DEBUG, ex);
}
}
return new ConfigurationSource(is, resource);
@@ -377,9 +379,9 @@ public abstract class ConfigurationFacto
ConfigurationSource source = null;
try {
source = getInputFromURI(FileUtils.getCorrectedFilePathUri(config));
- } catch (Exception ex) {
+ } catch (final Exception ex) {
// Ignore the error and try as a String.
- LOGGER.catching(ex);
+ LOGGER.catching(Level.DEBUG, ex);
}
if (source == null) {
final ClassLoader loader = this.getClass().getClassLoader();
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java?rev=1587454&r1=1587453&r2=1587454&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java Tue Apr 15 07:02:33 2014
@@ -35,6 +35,7 @@ import java.util.concurrent.ConcurrentHa
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CopyOnWriteArrayList;
+import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.helpers.Closer;
import org.apache.logging.log4j.core.helpers.Loader;
@@ -250,7 +251,7 @@ public class PluginManager {
final PluginType<?> pluginType = loadPluginType(className, name, printable, defer);
types.put(key, pluginType);
} catch (final ClassNotFoundException e) {
- LOGGER.catching(e);
+ LOGGER.catching(Level.DEBUG, e);
LOGGER.info("Plugin [{}] could not be loaded due to missing classes.", className);
}
}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TLSSocketManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TLSSocketManager.java?rev=1587454&r1=1587453&r2=1587454&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TLSSocketManager.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TLSSocketManager.java Tue Apr 15 07:02:33 2014
@@ -27,6 +27,7 @@ import java.net.UnknownHostException;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
+import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.appender.ManagerFactory;
import org.apache.logging.log4j.core.helpers.Strings;
@@ -136,7 +137,7 @@ public class TLSSocketManager extends TC
os = new ByteArrayOutputStream();
}
catch (final TLSSocketManagerFactoryException e) {
- LOGGER.catching(e);
+ LOGGER.catching(Level.DEBUG, e);
return null;
}
return createManager(name, os, socket, data.sslConfig, address, data.host, data.port, data.delay, data.immediateFail, data.layout);