(logging-log4cxx) branch master updated: Restore socket retry functionality (#431)

[swebb2066]

This is an automated email from the ASF dual-hosted git repository.

swebb2066 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git


The following commit(s) were added to refs/heads/master by this push:
     new 7f2d85c0 Restore socket retry functionality (#431)
7f2d85c0 is described below

commit 7f2d85c01b599c686211c71aa215a3a406a27afb
Author: Stephen Webb <stephen.w...@ieee.org>
AuthorDate: Tue Nov 19 12:48:15 2024 +1100

    Restore socket retry functionality (#431)
    
    * Restore file monitoring functionality
---
 src/main/cpp/filewatchdog.cpp                                  | 4 ++++
 src/main/cpp/telnetappender.cpp                                | 5 ++++-
 src/main/include/log4cxx/private/socketappenderskeleton_priv.h | 7 +++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/cpp/filewatchdog.cpp b/src/main/cpp/filewatchdog.cpp
index ef9f80cd..903d9308 100644
--- a/src/main/cpp/filewatchdog.cpp
+++ b/src/main/cpp/filewatchdog.cpp
@@ -41,7 +41,11 @@ struct FileWatchdog::FileWatchdogPrivate{
 #if LOG4CXX_EVENTS_AT_EXIT
                , atExitRegistryRaii([this]{stopWatcher();})
 #endif
+       { }
+
+       ~FileWatchdogPrivate()
         { stopWatcher(); }
+
        /**
        The name of the file to observe  for changes.
        */
diff --git a/src/main/cpp/telnetappender.cpp b/src/main/cpp/telnetappender.cpp
index 204aba30..d012f66f 100644
--- a/src/main/cpp/telnetappender.cpp
+++ b/src/main/cpp/telnetappender.cpp
@@ -52,7 +52,10 @@ struct TelnetAppender::TelnetAppenderPriv : public 
AppenderSkeletonPrivate
 #if LOG4CXX_EVENTS_AT_EXIT
                , atExitRegistryRaii([this]{stopAcceptingConnections();})
 #endif
-        { stopAcceptingConnections(); }
+       { }
+
+       ~TelnetAppenderPriv()
+       { stopAcceptingConnections(); }
 
        int port;
        ConnectionList connections;
diff --git a/src/main/include/log4cxx/private/socketappenderskeleton_priv.h 
b/src/main/include/log4cxx/private/socketappenderskeleton_priv.h
index 9519db1a..64ef6c35 100644
--- a/src/main/include/log4cxx/private/socketappenderskeleton_priv.h
+++ b/src/main/include/log4cxx/private/socketappenderskeleton_priv.h
@@ -42,7 +42,7 @@ struct SocketAppenderSkeleton::SocketAppenderSkeletonPriv : 
public AppenderSkele
 #if LOG4CXX_EVENTS_AT_EXIT
                , atExitRegistryRaii([this]{stopMonitor();})
 #endif
-        { stopMonitor(); }
+        { }
 
        SocketAppenderSkeletonPriv(helpers::InetAddressPtr address, int 
defaultPort, int reconnectionDelay) :
                AppenderSkeletonPrivate(),
@@ -54,7 +54,7 @@ struct SocketAppenderSkeleton::SocketAppenderSkeletonPriv : 
public AppenderSkele
 #if LOG4CXX_EVENTS_AT_EXIT
                , atExitRegistryRaii([this]{stopMonitor();})
 #endif
-        { stopMonitor(); }
+        { }
 
        SocketAppenderSkeletonPriv(const LogString& host, int port, int delay) :
                AppenderSkeletonPrivate(),
@@ -66,6 +66,9 @@ struct SocketAppenderSkeleton::SocketAppenderSkeletonPriv : 
public AppenderSkele
 #if LOG4CXX_EVENTS_AT_EXIT
                , atExitRegistryRaii([this]{stopMonitor();})
 #endif
+       { }
+
+       ~SocketAppenderSkeletonPriv()
         { stopMonitor(); }
 
        /**