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 2017/01/04 03:22:09 UTC
logging-log4j2 git commit: Refactor duplicate code in SocketServer
classes
Repository: logging-log4j2
Updated Branches:
refs/heads/master 90e8e6053 -> b47115f47
Refactor duplicate code in SocketServer classes
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b47115f4
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b47115f4
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b47115f4
Branch: refs/heads/master
Commit: b47115f47e10830e48fcf70723ba22164951c677
Parents: 90e8e60
Author: Matt Sicker <ma...@spr.com>
Authored: Tue Jan 3 21:21:50 2017 -0600
Committer: Matt Sicker <ma...@spr.com>
Committed: Tue Jan 3 21:21:50 2017 -0600
----------------------------------------------------------------------
.../core/net/server/AbstractSocketServer.java | 18 ++----------------
.../log4j/core/net/server/TcpSocketServer.java | 3 ++-
.../log4j/core/net/server/UdpSocketServer.java | 3 ++-
3 files changed, 6 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b47115f4/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/AbstractSocketServer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/AbstractSocketServer.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/AbstractSocketServer.java
index 0d28645..0130d92 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/AbstractSocketServer.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/AbstractSocketServer.java
@@ -27,6 +27,8 @@ import java.net.URI;
import java.net.URL;
import java.util.Objects;
+import com.beust.jcommander.Parameter;
+import com.beust.jcommander.validators.PositiveInteger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LogEventListener;
@@ -40,10 +42,6 @@ import org.apache.logging.log4j.core.util.InetAddressConverter;
import org.apache.logging.log4j.core.util.Log4jThread;
import org.apache.logging.log4j.util.Strings;
-import com.beust.jcommander.JCommander;
-import com.beust.jcommander.Parameter;
-import com.beust.jcommander.validators.PositiveInteger;
-
/**
* Abstract socket server for TCP and UDP implementations.
*
@@ -154,18 +152,6 @@ public abstract class AbstractSocketServer<T extends InputStream> extends LogEve
protected static final int MAX_PORT = 65534;
- static <T extends CommandLineArguments> T parseCommandLine(final String[] mainArgs, final Class<?> clazz,
- final T args) {
- final JCommander jCommander = new JCommander(args);
- jCommander.setProgramName(clazz.getName());
- jCommander.setCaseSensitiveOptions(false);
- jCommander.parse(mainArgs);
- if (args.isHelp()) {
- jCommander.usage();
- }
- return args;
- }
-
private volatile boolean active = true;
protected final LogEventBridge<T> logEventInput;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b47115f4/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TcpSocketServer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TcpSocketServer.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TcpSocketServer.java
index c60b6f4..f3100aa 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TcpSocketServer.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TcpSocketServer.java
@@ -32,6 +32,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import org.apache.logging.log4j.core.config.ConfigurationFactory;
+import org.apache.logging.log4j.core.util.BasicCommandLineArguments;
import org.apache.logging.log4j.core.util.Log4jThread;
import org.apache.logging.log4j.message.EntryMessage;
@@ -184,7 +185,7 @@ public class TcpSocketServer<T extends InputStream> extends AbstractSocketServer
* if an error occurs.
*/
public static void main(final String[] args) throws Exception {
- final CommandLineArguments cla = parseCommandLine(args, TcpSocketServer.class, new CommandLineArguments());
+ final CommandLineArguments cla = BasicCommandLineArguments.parseCommandLine(args, TcpSocketServer.class, new CommandLineArguments());
if (cla.isHelp()) {
return;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b47115f4/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/UdpSocketServer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/UdpSocketServer.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/UdpSocketServer.java
index 74829bc..427a365 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/UdpSocketServer.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/UdpSocketServer.java
@@ -28,6 +28,7 @@ import java.net.DatagramPacket;
import java.net.DatagramSocket;
import org.apache.logging.log4j.core.config.ConfigurationFactory;
+import org.apache.logging.log4j.core.util.BasicCommandLineArguments;
import org.apache.logging.log4j.core.util.Log4jThread;
/**
@@ -87,7 +88,7 @@ public class UdpSocketServer<T extends InputStream> extends AbstractSocketServer
* if an error occurs.
*/
public static void main(final String[] args) throws Exception {
- final CommandLineArguments cla = parseCommandLine(args, UdpSocketServer.class, new CommandLineArguments());
+ final CommandLineArguments cla = BasicCommandLineArguments.parseCommandLine(args, UdpSocketServer.class, new CommandLineArguments());
if (cla.isHelp()) {
return;
}