From 5f74ae42b20c5b1682cd13595999e3f3c1e7445f Mon Sep 17 00:00:00 2001 From: Stephen Webb Date: Sat, 19 Apr 2025 14:38:29 +1000 Subject: [PATCH 1/4] Bump version to 1.5.0 --- src/cmake/projectVersionDetails.cmake | 2 +- src/site/markdown/change-report-gh.md | 15 +++++++++++++++ src/site/markdown/download.md.in | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/cmake/projectVersionDetails.cmake b/src/cmake/projectVersionDetails.cmake index 85adf450a..357b6d8fb 100644 --- a/src/cmake/projectVersionDetails.cmake +++ b/src/cmake/projectVersionDetails.cmake @@ -2,4 +2,4 @@ # setting the project version. The variable name must not # clash with the log4cxx_VERSION* variables automatically # defined by the project() command. -set(log4cxx_VER 1.4.0.0) +set(log4cxx_VER 1.5.0.0) diff --git a/src/site/markdown/change-report-gh.md b/src/site/markdown/change-report-gh.md index 5fd92223c..396e21e10 100644 --- a/src/site/markdown/change-report-gh.md +++ b/src/site/markdown/change-report-gh.md @@ -25,6 +25,7 @@ Change Log {#changelog} | Version | Date | Description | | ------------------- | ---------- | -------------------- | +| [1.5.0](#rel_1_5_0) | 2025-XX-XX | Maintenance release | | [1.4.0](#rel_1_4_0) | 2025-03-01 | Maintenance release | | [1.3.1](#rel_1_3_1) | 2024-11-30 | Bugfix release | | [1.3.0](#rel_1_3_0) | 2024-10-21 | Maintenance release | @@ -48,6 +49,20 @@ Change Log {#changelog} | [0.1.0](#rel_1_0) | 2003-07-08 | | | [0.0.1](#rel_0_1) | 2003-05-31 | | +## Release 1.5.0 - 2025-XX-XX {#rel_1_5_0} + +Release 1.5.0 includes the following new features: + +* Qt6 can be used when building with LOG4CXX_QT_SUPPORT=on + \[[#488](https://github.com/apache/logging-log4cxx/pull/488)\] +* TelnetAppender can now deliver messages when the socket is in a TIME_WAIT state + \[[#495](https://github.com/apache/logging-log4cxx/pull/495)\] + +The following issues have been addressed: + +* It was possible for logging events to be lost when reloading a configuration file + \[[#491](https://github.com/apache/logging-log4cxx/issues/491)\] + ## Release 1.4.0 - 2025-03-01 {#rel_1_4_0} Release 1.4.0 includes the following new features: diff --git a/src/site/markdown/download.md.in b/src/site/markdown/download.md.in index cc4312824..07a4100b3 100644 --- a/src/site/markdown/download.md.in +++ b/src/site/markdown/download.md.in @@ -56,6 +56,7 @@ in many unix distributions. | Version | Release Date | | :--------------------------: | :----------------------: | +| [1.4.0](${LOG4CXX_DOCUMENTATION_URL}/1.4.0/download.html) | Mar-2025 | | [1.3.1](${LOG4CXX_DOCUMENTATION_URL}/1.3.1/download.html) | Nov-2024 | | [1.2.0](${LOG4CXX_DOCUMENTATION_URL}/1.2.0/download.html) | Jan-2024 | | [1.1.0](${LOG4CXX_DOCUMENTATION_URL}/1.1.0/download.html) | May-2023 | From a3f6f50c4c5867b3cc525c908aa8ef2189a49636 Mon Sep 17 00:00:00 2001 From: Stephen Webb Date: Sat, 19 Apr 2025 17:27:37 +1000 Subject: [PATCH 2/4] Improve the description of the reuseAddress TelnetAppender option --- src/main/include/log4cxx/net/telnetappender.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/include/log4cxx/net/telnetappender.h b/src/main/include/log4cxx/net/telnetappender.h index a35169b17..c7bd1c16b 100644 --- a/src/main/include/log4cxx/net/telnetappender.h +++ b/src/main/include/log4cxx/net/telnetappender.h @@ -99,7 +99,7 @@ class LOG4CXX_EXPORT TelnetAppender : public AppenderSkeleton Port | {int} | 23 MaxConnections | {int} | 20 Encoding | C,UTF-8,UTF-16,UTF-16BE,UTF-16LE,646,US-ASCII,ISO646-US,ANSI_X3.4-1968,ISO-8859-1,ISO-LATIN-1 | UTF-8 - ReuseAddress | True,False | True + ReuseAddress | True,False | False \sa AppenderSkeleton::setOption() */ @@ -130,13 +130,13 @@ class LOG4CXX_EXPORT TelnetAppender : public AppenderSkeleton void setMaxConnections(int newValue); /** - Set the SO_REUSEADDR option to of the server socket. - This allows the socket to bind to an address that is in a TIME_WAIT state. - This is useful for restarting immediately after it has been closed. + Use \c newValue for the SO_REUSEADDR option of the socket accepting connections. + This allows a telnet client to connect when the socket is in a TIME_WAIT state, + so log message delivery will resume quickly when a terminated process restarts. \sa setOption */ - void setReuseAddress(bool reuseAddress); + void setReuseAddress(bool newValue); /** Shutdown this appender. */ void close() override; From d7a322932e731a23c3f7157b82090f9287369d17 Mon Sep 17 00:00:00 2001 From: Stephen Webb Date: Sat, 19 Apr 2025 17:33:09 +1000 Subject: [PATCH 3/4] Improve the description of the reuseAddress TelnetAppender option --- src/main/include/log4cxx/net/telnetappender.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/include/log4cxx/net/telnetappender.h b/src/main/include/log4cxx/net/telnetappender.h index c7bd1c16b..cccc56911 100644 --- a/src/main/include/log4cxx/net/telnetappender.h +++ b/src/main/include/log4cxx/net/telnetappender.h @@ -42,8 +42,9 @@ especially when monitoring a servlet remotely. If no layout is provided, the log message only is sent to attached client(s). -The ReuseAddress option is disabled by default, -enable it if you want it to be able to bind to the address immediately after restarting / crashing +The ReuseAddress option is disabled by default. +Enable it to be able to connect to this appender +immediately after the logging process restarts. See TelnetAppender::setOption() for the available options. @@ -131,7 +132,7 @@ class LOG4CXX_EXPORT TelnetAppender : public AppenderSkeleton /** Use \c newValue for the SO_REUSEADDR option of the socket accepting connections. - This allows a telnet client to connect when the socket is in a TIME_WAIT state, + When set to \c true, a telnet client can connect when the socket is in a TIME_WAIT state, so log message delivery will resume quickly when a terminated process restarts. \sa setOption From fb598343a7e15f7ecb64cae131c5f5378ae62b64 Mon Sep 17 00:00:00 2001 From: Stephen Webb Date: Sat, 19 Apr 2025 17:41:36 +1000 Subject: [PATCH 4/4] Improve the description of the reuseAddress TelnetAppender option --- src/main/include/log4cxx/net/telnetappender.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/include/log4cxx/net/telnetappender.h b/src/main/include/log4cxx/net/telnetappender.h index cccc56911..e38d344c4 100644 --- a/src/main/include/log4cxx/net/telnetappender.h +++ b/src/main/include/log4cxx/net/telnetappender.h @@ -42,7 +42,7 @@ especially when monitoring a servlet remotely. If no layout is provided, the log message only is sent to attached client(s). -The ReuseAddress option is disabled by default. +The \c ReuseAddress option is disabled by default. Enable it to be able to connect to this appender immediately after the logging process restarts.