Restore socket retry functionality

apache · Nov 18, 2024 · 4fb758e · 4fb758e
1 parent 3aa883c
commit 4fb758e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git 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
@@ -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/cpp/xmlsocketappender.cpp b/src/main/cpp/xmlsocketappender.cpp
@@ -135,6 +135,7 @@ void XMLSocketAppender::append(const spi::LoggingEventPtr& event, LOG4CXX_NS::he
 		}
 		catch (std::exception& e)
 		{
+			_priv->writer->close(p);
 			_priv->writer = nullptr;
 			LogLog::warn(LOG4CXX_STR("Detected problem with connection: "), e);
 

diff --git 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(); }
 
 	/**