Repository: logging-log4j2 Updated Branches: refs/heads/master 687b383f3 -> a4258b685
[LOG4J2-1042] Socket and Syslog appenders don't take timeout into account at startup. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a4258b68 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a4258b68 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a4258b68 Branch: refs/heads/master Commit: a4258b6855471a3cd329c2654718777985a8f6c4 Parents: 687b383 Author: Gary Gregory <garydgreg...@gmail.com> Authored: Fri Jun 5 11:50:10 2015 -0700 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Fri Jun 5 11:50:10 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/logging/log4j/core/net/TcpSocketManager.java | 4 +++- src/changes/changes.xml | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a4258b68/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java ---------------------------------------------------------------------- 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 5d9357d..60bc17d 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 @@ -282,7 +282,9 @@ public class TcpSocketManager extends AbstractSocketManager { return null; } try { - final Socket socket = new Socket(data.host, data.port); + // LOG4J2-1042 + final Socket socket = new Socket(); + socket.connect(new InetSocketAddress(data.host, data.port), data.connectTimeoutMillis); os = socket.getOutputStream(); return new TcpSocketManager(name, os, socket, inetAddress, data.host, data.port, data.connectTimeoutMillis, data.delayMillis, data.immediateFail, data.layout); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a4258b68/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index f5a658e..11dc70b 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -51,6 +51,9 @@ <action issue="LOG4J2-1038" dev="ggregory" type="fix" due-to="Gili"> Incorrect documentation for layout default charset. </action> + <action issue="LOG4J2-1042" dev="ggregory" type="fix" due-to="Guillaume Turri"> + Socket and Syslog appenders don't take timeout into account at startup. + </action> <action issue="LOG4J2-403" dev="ggregory" type="update" due-to="Poorna Subhash P, Jeremy Lautman"> MongoDB appender, username and password should be optional. </action>
