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/03/03 17:01:38 UTC
[logging-log4j2] branch release-2.x updated: [LOG4J2-3425] Syslog appender lacks the SocketOptions setting.
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
The following commit(s) were added to refs/heads/release-2.x by this push:
new dc1742c [LOG4J2-3425] Syslog appender lacks the SocketOptions setting.
dc1742c is described below
commit dc1742c0ffb51cf85ae690e91f7661af525e4c86
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Mar 3 12:01:30 2022 -0500
[LOG4J2-3425] Syslog appender lacks the SocketOptions setting.
---
.../java/org/apache/logging/log4j/core/appender/SyslogAppender.java | 2 +-
src/changes/changes.xml | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
index c65b1e5..c15a796 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
@@ -133,7 +133,7 @@ public class SyslogAppender extends SocketAppender {
return null;
}
final AbstractSocketManager manager = createSocketManager(name, protocol, getHost(), getPort(), getConnectTimeoutMillis(),
- sslConfiguration, getReconnectDelayMillis(), getImmediateFail(), layout, Constants.ENCODER_BYTE_BUFFER_SIZE, null);
+ sslConfiguration, getReconnectDelayMillis(), getImmediateFail(), layout, Constants.ENCODER_BYTE_BUFFER_SIZE, getSocketOptions());
return new SyslogAppender(name, layout, getFilter(), isIgnoreExceptions(), isImmediateFlush(), manager,
getAdvertise() ? configuration.getAdvertiser() : null, null);
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index adc312f..763eed8 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -36,6 +36,9 @@
<action issue="LOG4J2-3423" type="fix" due-to="Radim Tlusty, Gary Gregory">
JAR file containing Log4j configuration isn't closed.
</action>
+ <action issue="LOG4J2-3425" type="fix" due-to="Jiří Smolík, Gary Gregory">
+ Syslog appender lacks the SocketOptions setting.
+ </action>
</release>
<release version="2.17.2" date="2022-02-23" description="GA Release 2.17.2">
<!-- FIXES -->