You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2018/10/26 21:59:57 UTC
logging-log4j2 git commit: Pull up and use logger() method.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 43c5cfd65 -> aa4bec184
Pull up and use logger() method.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/aa4bec18
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/aa4bec18
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/aa4bec18
Branch: refs/heads/master
Commit: aa4bec1842f455a7d3fde4758d695ceb98374a55
Parents: 43c5cfd
Author: Gary Gregory <ga...@gmail.com>
Authored: Fri Oct 26 15:59:54 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Fri Oct 26 15:59:54 2018 -0600
----------------------------------------------------------------------
.../logging/log4j/core/appender/AbstractManager.java | 4 ++++
.../log4j/core/appender/db/AbstractDatabaseManager.java | 5 -----
.../apache/logging/log4j/jms/appender/JmsManager.java | 11 ++++-------
3 files changed, 8 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/aa4bec18/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java
index 5b146f8..e85871f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java
@@ -164,6 +164,10 @@ public abstract class AbstractManager implements AutoCloseable {
manager.getName() + "'");
}
+ protected static StatusLogger logger() {
+ return StatusLogger.getLogger();
+ }
+
/**
* May be overridden by managers to perform processing while the manager is being released and the
* lock is held. A timeout is passed for implementors to use as they see fit.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/aa4bec18/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
index 26ceffe..0350543 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java
@@ -26,7 +26,6 @@ import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.appender.AbstractManager;
import org.apache.logging.log4j.core.appender.ManagerFactory;
-import org.apache.logging.log4j.status.StatusLogger;
/**
* Manager that allows database appenders to have their configuration reloaded without losing events.
@@ -243,10 +242,6 @@ public abstract class AbstractDatabaseManager extends AbstractManager implements
return AbstractManager.getManager(name, factory, data);
}
- protected static StatusLogger logger() {
- return StatusLogger.getLogger();
- }
-
/**
* Implementations should extend this class for passing data between the getManager method and the manager factory
* class.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/aa4bec18/log4j-jms/src/main/java/org/apache/logging/log4j/jms/appender/JmsManager.java
----------------------------------------------------------------------
diff --git a/log4j-jms/src/main/java/org/apache/logging/log4j/jms/appender/JmsManager.java b/log4j-jms/src/main/java/org/apache/logging/log4j/jms/appender/JmsManager.java
index 77b703a..b0f30cd 100644
--- a/log4j-jms/src/main/java/org/apache/logging/log4j/jms/appender/JmsManager.java
+++ b/log4j-jms/src/main/java/org/apache/logging/log4j/jms/appender/JmsManager.java
@@ -33,7 +33,6 @@ import javax.jms.MessageProducer;
import javax.jms.Session;
import javax.naming.NamingException;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.appender.AbstractManager;
import org.apache.logging.log4j.core.appender.AppenderLoggingException;
@@ -129,7 +128,7 @@ public class JmsManager extends AbstractManager {
try {
return new JmsManager(name, data);
} catch (final Exception e) {
- LOGGER.error("Error creating JmsManager using JmsManagerConfiguration [{}]", data, e);
+ logger().error("Error creating JmsManager using JmsManagerConfiguration [{}]", data, e);
return null;
}
}
@@ -175,7 +174,7 @@ public class JmsManager extends AbstractManager {
reconnector = null;
shutdown = true;
}
- LOGGER.debug("Connection reestablished to {}", configuration);
+ logger().debug("Connection reestablished to {}", configuration);
}
@Override
@@ -185,7 +184,7 @@ public class JmsManager extends AbstractManager {
sleep(configuration.getReconnectIntervalMillis());
reconnect();
} catch (final InterruptedException | JMSException | NamingException e) {
- LOGGER.debug("Cannot reestablish JMS connection to {}: {}", configuration, e.getLocalizedMessage(),
+ logger().debug("Cannot reestablish JMS connection to {}: {}", configuration, e.getLocalizedMessage(),
e);
} finally {
latch.countDown();
@@ -199,8 +198,6 @@ public class JmsManager extends AbstractManager {
}
- private static final Logger LOGGER = StatusLogger.getLogger();
-
static final JmsManagerFactory FACTORY = new JmsManagerFactory();
/**
@@ -460,7 +457,7 @@ public class JmsManager extends AbstractManager {
closeJndiManager();
reconnector.reconnect();
} catch (NamingException | JMSException reconnEx) {
- LOGGER.debug("Cannot reestablish JMS connection to {}: {}; starting reconnector thread {}",
+ logger().debug("Cannot reestablish JMS connection to {}: {}; starting reconnector thread {}",
configuration, reconnEx.getLocalizedMessage(), reconnector.getName(), reconnEx);
reconnector.start();
throw new AppenderLoggingException(