Release memory at exit when LogManager::shutdown is not called

apache · Dec 20, 2024 · e8c656a · e8c656a
1 parent e227b5c
commit e8c656a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/src/main/cpp/aprinitializer.cpp b/src/main/cpp/aprinitializer.cpp
@@ -96,6 +96,7 @@ APRInitializer::APRInitializer() :
 
 APRInitializer::~APRInitializer()
 {
+	deleteWatchDogs();
 	isDestructed = true;
 #if APR_HAS_THREADS
 	std::lock_guard<std::mutex> lock(m_priv->mutex);

diff --git a/src/main/cpp/filewatchdog.cpp b/src/main/cpp/filewatchdog.cpp
@@ -78,11 +78,7 @@ bool FileWatchdog::is_active()
 
 void FileWatchdog::stop()
 {
-	if (is_active())
-	{
-		LogLog::debug(LOG4CXX_STR("Stopping file watchdog"));
-		ThreadUtility::instance()->removePeriodicTask(m_priv->taskName);
-	}
+	ThreadUtility::instance()->removePeriodicTask(m_priv->taskName);
 }
 
 /**
@@ -134,8 +130,8 @@ void FileWatchdog::checkAndConfigure()
 
 void FileWatchdog::start()
 {
-	checkAndConfigure();
 	auto p = ThreadUtility::instance();
+	checkAndConfigure();
 	if (!p->hasPeriodicTask(m_priv->taskName))
 	{
 		if (LogLog::isDebugEnabled())

diff --git a/src/main/cpp/threadutility.cpp b/src/main/cpp/threadutility.cpp
@@ -79,8 +79,8 @@ struct ThreadUtility::priv_data
 	std::condition_variable   interrupt;
 	std::mutex                interrupt_mutex;
 	bool                      terminated{false};
-	int                       retryCount{2};
-	Period                    maxDelay;
+	int                       retryCount{ 2 };
+	Period                    maxDelay{ 0 };
 
 	void doPeriodicTasks();
 

diff --git a/src/main/include/log4cxx/helpers/threadutility.h b/src/main/include/log4cxx/helpers/threadutility.h
@@ -71,7 +71,6 @@ LOG4CXX_PTR_DEF(ThreadUtility);
 class LOG4CXX_EXPORT ThreadUtility
 {
 	private:
-		friend class LOG4CXX_NS::helpers::WideLife<ThreadUtility>;
 		friend class LOG4CXX_NS::helpers::SingletonHolder<ThreadUtility>;
 		ThreadUtility();