Test hypothesis

apache · Dec 20, 2024 · 1d18770 · 1d18770
1 parent 1df1a0b
commit 1d18770
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/main/cpp/fileappender.cpp b/src/main/cpp/fileappender.cpp
@@ -206,7 +206,8 @@ void FileAppender::activateOptionsInternal(Pool& p)
 		}
 		else if (0 == _priv->bufferedSeconds)
 		{
-			ThreadUtility::instance()->removePeriodicTask(getName());
+			if (auto p = _priv->taskManager.lock())
+				p->value()->removePeriodicTask(getName());
 		}
 	}
 }

diff --git a/src/main/cpp/filewatchdog.cpp b/src/main/cpp/filewatchdog.cpp
@@ -136,8 +136,8 @@ void FileWatchdog::checkAndConfigure()
 
 void FileWatchdog::start()
 {
-	checkAndConfigure();
 	auto taskManager = ThreadUtility::instancePtr();
+	checkAndConfigure();
 	if (!taskManager->value().hasPeriodicTask(m_priv->taskName))
 	{
 		if (LogLog::isDebugEnabled())

diff --git a/src/main/cpp/threadutility.cpp b/src/main/cpp/threadutility.cpp
@@ -56,8 +56,10 @@ struct ThreadUtility::priv_data
 	{
 	}
 
+#ifdef MSYS_UCRT_DOES_NOT_HANG_HERE
 	~priv_data()
 	{ stopThread(); }
+#endif
 
 	ThreadStartPre  start_pre{nullptr};
 	ThreadStarted   started{nullptr};