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 2022/01/20 15:49:10 UTC
[logging-log4j2] branch release-2.x updated (1465421 -> e2ee2f4)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.
from 1465421 Bump maven-dependency-plugin from 3.0.2 to 3.2.0 (#724)
new 6fcefe2 No need to initialize instance variables to default values.
new 25486d0 Merge branch 'release-2.x' of https://gitbox.apache.org/repos/asf/logging-log4j2 into release-2.x
new e2ee2f4 Use a singleton for HostResolver since it is stateless.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/logging/log4j/core/net/SslSocketManager.java | 2 +-
.../org/apache/logging/log4j/core/net/TcpSocketManager.java | 13 +++++++++----
.../logging/log4j/core/net/SocketAppenderReconnectTest.java | 8 ++++----
3 files changed, 14 insertions(+), 9 deletions(-)
[logging-log4j2] 01/03: No need to initialize instance variables to default values.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 6fcefe23c93ba4a70b15db2ffc571190859beb18
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Jan 20 10:41:57 2022 -0500
No need to initialize instance variables to default values.
---
.../logging/log4j/core/net/SocketAppenderReconnectTest.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketAppenderReconnectTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketAppenderReconnectTest.java
index 997d22c..318addc 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketAppenderReconnectTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketAppenderReconnectTest.java
@@ -233,13 +233,13 @@ public class SocketAppenderReconnectTest {
*/
private static final class LineReadingTcpServer implements AutoCloseable {
- private volatile boolean running = false;
+ private volatile boolean running;
- private ServerSocket serverSocket = null;
+ private ServerSocket serverSocket;
- private Socket clientSocket = null;
+ private Socket clientSocket;
- private Thread readerThread = null;
+ private Thread readerThread;
private final BlockingQueue<String> lines = new LinkedBlockingQueue<>();
[logging-log4j2] 03/03: Use a singleton for HostResolver since it is stateless.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit e2ee2f4dd9327eb1841023c3269ba12f5673e694
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Jan 20 10:49:05 2022 -0500
Use a singleton for HostResolver since it is stateless.
---
.../org/apache/logging/log4j/core/net/SslSocketManager.java | 2 +-
.../org/apache/logging/log4j/core/net/TcpSocketManager.java | 13 +++++++++----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
index e9e018d..9f0f5f5 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
@@ -167,7 +167,7 @@ public class SslSocketManager extends TcpSocketManager {
@Override
Socket createSocket(final SslFactoryData data) throws IOException {
- List<InetSocketAddress> socketAddresses = resolver.resolveHost(data.host, data.port);
+ List<InetSocketAddress> socketAddresses = RESOLVER.resolveHost(data.host, data.port);
IOException ioe = null;
for (InetSocketAddress socketAddress : socketAddresses) {
try {
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
index 174b1e5..03d5e55 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
@@ -345,7 +345,7 @@ public class TcpSocketManager extends AbstractSocketManager {
}
void reconnect() throws IOException {
- List<InetSocketAddress> socketAddresses = FACTORY.resolver.resolveHost(host, port);
+ List<InetSocketAddress> socketAddresses = TcpSocketManagerFactory.RESOLVER.resolveHost(host, port);
if (socketAddresses.size() == 1) {
LOGGER.debug("Reconnecting " + socketAddresses.get(0));
connect(socketAddresses.get(0));
@@ -459,7 +459,7 @@ public class TcpSocketManager extends AbstractSocketManager {
protected static class TcpSocketManagerFactory<M extends TcpSocketManager, T extends FactoryData>
implements ManagerFactory<M, T> {
- static HostResolver resolver = new HostResolver();
+ static volatile HostResolver RESOLVER = HostResolver.INSTANCE;
@SuppressWarnings("resource")
@Override
@@ -497,7 +497,7 @@ public class TcpSocketManager extends AbstractSocketManager {
}
Socket createSocket(final T data) throws IOException {
- List<InetSocketAddress> socketAddresses = resolver.resolveHost(data.host, data.port);
+ List<InetSocketAddress> socketAddresses = RESOLVER.resolveHost(data.host, data.port);
IOException ioe = null;
for (InetSocketAddress socketAddress : socketAddresses) {
try {
@@ -537,10 +537,15 @@ public class TcpSocketManager extends AbstractSocketManager {
* @param resolver the HostResolver.
*/
public static void setHostResolver(HostResolver resolver) {
- TcpSocketManagerFactory.resolver = resolver;
+ TcpSocketManagerFactory.RESOLVER = resolver;
}
public static class HostResolver {
+
+ /**
+ * Singleton instance.
+ */
+ public static final HostResolver INSTANCE = new HostResolver();
public List<InetSocketAddress> resolveHost(String host, int port) throws UnknownHostException {
InetAddress[] addresses = InetAddress.getAllByName(host);
[logging-log4j2] 02/03: Merge branch 'release-2.x' of https://gitbox.apache.org/repos/asf/logging-log4j2 into release-2.x
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 25486d0754555cb281c60b912d98fb423e2f4f8d
Merge: 6fcefe2 1465421
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Jan 20 10:42:08 2022 -0500
Merge branch 'release-2.x' of https://gitbox.apache.org/repos/asf/logging-log4j2 into release-2.x
log4j-api/pom.xml | 2 +-
log4j-core/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)