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 2016/11/14 01:42:36 UTC
logging-log4j2 git commit: Remove dead code.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 543edab34 -> 22c294cc7
Remove dead code.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/22c294cc
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/22c294cc
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/22c294cc
Branch: refs/heads/master
Commit: 22c294cc7bc7108ef70274e7b96349e37f455e5b
Parents: 543edab
Author: Gary Gregory <gg...@apache.org>
Authored: Sun Nov 13 17:42:33 2016 -0800
Committer: Gary Gregory <gg...@apache.org>
Committed: Sun Nov 13 17:42:33 2016 -0800
----------------------------------------------------------------------
.../log4j/core/appender/SocketAppender.java | 26 +++-----------------
1 file changed, 3 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/22c294cc/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
index 8af4cec..95f9d6e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
@@ -276,15 +276,14 @@ public class SocketAppender extends AbstractOutputStreamAppender<AbstractSocketM
final int reconnectDelayMillis,
final boolean immediateFail,
final String name,
- boolean immediateFlush,
+ final boolean immediateFlush,
final boolean ignoreExceptions,
- Layout<? extends Serializable> layout,
+ final Layout<? extends Serializable> layout,
final Filter filter,
final boolean advertise,
final Configuration configuration) {
// @formatter:on
- if (true) {
// @formatter:off
return newBuilder()
.withAdvertise(advertise)
@@ -302,27 +301,8 @@ public class SocketAppender extends AbstractOutputStreamAppender<AbstractSocketM
.withSslConfiguration(sslConfig)
.build();
// @formatter:on
- }
- if (layout == null) {
- layout = SerializedLayout.createLayout();
- }
-
- if (name == null) {
- LOGGER.error("No name provided for SocketAppender");
- return null;
- }
-
- final Protocol actualProtocol = protocol != null ? protocol : Protocol.TCP;
- if (actualProtocol == Protocol.UDP) {
- immediateFlush = true;
- }
-
- final AbstractSocketManager manager = createSocketManager(name, actualProtocol, host, port,
- connectTimeoutMillis, sslConfig, reconnectDelayMillis, immediateFail, layout, Constants.ENCODER_BYTE_BUFFER_SIZE);
-
- return new SocketAppender(name, layout, filter, manager, ignoreExceptions, immediateFlush,
- advertise ? configuration.getAdvertiser() : null);
}
+
/**
* Creates a socket appender.
*