Revert "The FileWatchDog thread no longer uses APR threads"

This reverts commit 5a934e8.
apache · Nov 20, 2023 · c5c13ac · c5c13ac
1 parent a73b876
commit c5c13ac
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 1 deletion.
diff --git a/src/main/cpp/class.cpp b/src/main/cpp/class.cpp
@@ -171,7 +171,9 @@ bool Class::registerClass(const Class& newClass)
 
 void Class::registerClasses()
 {
+#if APR_HAS_THREADS
 	AsyncAppender::registerClass();
+#endif
 	ConsoleAppender::registerClass();
 	FileAppender::registerClass();
 	LOG4CXX_NS::db::ODBCAppender::registerClass();

diff --git a/src/main/cpp/domconfigurator.cpp b/src/main/cpp/domconfigurator.cpp
@@ -65,6 +65,7 @@ struct DOMConfigurator::DOMConfiguratorPrivate
 	spi::LoggerFactoryPtr loggerFactory;
 };
 
+#if APR_HAS_THREADS
 namespace LOG4CXX_NS
 {
 namespace xml
@@ -89,6 +90,7 @@ class XMLWatchdog  : public FileWatchdog
 }
 }
 XMLWatchdog* DOMConfigurator::xdog = NULL;
+#endif
 
 
 IMPLEMENT_LOG4CXX_OBJECT(DOMConfigurator)
@@ -909,6 +911,8 @@ spi::ConfigurationStatus DOMConfigurator::configureAndWatch(const CFStringRef& f
 spi::ConfigurationStatus DOMConfigurator::configureAndWatch(const std::string& filename, long delay)
 {
 	File file(filename);
+#if APR_HAS_THREADS
+
 	if ( xdog )
 	{
 		APRInitializer::unregisterCleanup(xdog);
@@ -923,12 +927,17 @@ spi::ConfigurationStatus DOMConfigurator::configureAndWatch(const std::string& f
 	xdog->start();
 
 	return status;
+#else
+	return DOMConfigurator().doConfigure(file, LogManager::getLoggerRepository());
+#endif
 }
 
 #if LOG4CXX_WCHAR_T_API
 spi::ConfigurationStatus DOMConfigurator::configureAndWatch(const std::wstring& filename, long delay)
 {
 	File file(filename);
+#if APR_HAS_THREADS
+
 	if ( xdog )
 	{
 		APRInitializer::unregisterCleanup(xdog);
@@ -943,13 +952,18 @@ spi::ConfigurationStatus DOMConfigurator::configureAndWatch(const std::wstring&
 	xdog->start();
 
 	return status;
+#else
+	return DOMConfigurator().doConfigure(file, LogManager::getLoggerRepository());
+#endif
 }
 #endif
 
 #if LOG4CXX_UNICHAR_API || LOG4CXX_LOGCHAR_IS_UNICHAR
 spi::ConfigurationStatus DOMConfigurator::configureAndWatch(const std::basic_string<UniChar>& filename, long delay)
 {
 	File file(filename);
+#if APR_HAS_THREADS
+
 	if ( xdog )
 	{
 		APRInitializer::unregisterCleanup(xdog);
@@ -964,13 +978,18 @@ spi::ConfigurationStatus DOMConfigurator::configureAndWatch(const std::basic_str
 	xdog->start();
 
 	return status;
+#else
+	return DOMConfigurator().doConfigure(file, LogManager::getLoggerRepository());
+#endif
 }
 #endif
 
 #if LOG4CXX_CFSTRING_API
 spi::ConfigurationStatus DOMConfigurator::configureAndWatch(const CFStringRef& filename, long delay)
 {
 	File file(filename);
+#if APR_HAS_THREADS
+
 	if ( xdog )
 	{
 		APRInitializer::unregisterCleanup(xdog);
@@ -985,6 +1004,9 @@ spi::ConfigurationStatus DOMConfigurator::configureAndWatch(const CFStringRef& f
 	xdog->start();
 
 	return status;
+#else
+	return DOMConfigurator().doConfigure(file, LogManager::getLoggerRepository());
+#endif
 }
 #endif
 

diff --git a/src/main/cpp/optionconverter.cpp b/src/main/cpp/optionconverter.cpp
@@ -42,8 +42,9 @@
 	#define LOG4CXX 1
 #endif
 #include <log4cxx/helpers/aprinitializer.h>
-#include <log4cxx/helpers/filewatchdog.h>
 
+#if APR_HAS_THREADS
+#include <log4cxx/helpers/filewatchdog.h>
 namespace LOG4CXX_NS
 {
 
@@ -69,6 +70,7 @@ class ConfiguratorWatchdog  : public helpers::FileWatchdog
 };
 
 }
+#endif
 
 using namespace LOG4CXX_NS;
 using namespace LOG4CXX_NS::helpers;
@@ -443,6 +445,7 @@ void OptionConverter::selectAndConfigure(const File& configFileName,
 		configurator = std::make_shared<PropertyConfigurator>();
 	}
 
+#if APR_HAS_THREADS
 	if (0 < delay)
 	{
 		auto dog = new ConfiguratorWatchdog(configurator, configFileName);
@@ -451,5 +454,6 @@ void OptionConverter::selectAndConfigure(const File& configFileName,
 		dog->start();
 	}
 	else
+#endif
 		configurator->doConfigure(configFileName, hierarchy);
 }
diff --git a/src/main/cpp/propertyconfigurator.cpp b/src/main/cpp/propertyconfigurator.cpp
@@ -135,6 +135,7 @@ spi::ConfigurationStatus PropertyConfigurator::configure(helpers::Properties& pr
 	return PropertyConfigurator().doConfigure(properties, LogManager::getLoggerRepository());
 }
 
+#if APR_HAS_THREADS
 spi::ConfigurationStatus PropertyConfigurator::configureAndWatch(const File& configFilename)
 {
 	return configureAndWatch(configFilename, FileWatchdog::DEFAULT_DELAY);
@@ -160,6 +161,7 @@ spi::ConfigurationStatus PropertyConfigurator::configureAndWatch(
 
 	return stat;
 }
+#endif
 
 spi::ConfigurationStatus PropertyConfigurator::doConfigure(helpers::Properties& properties,
 	spi::LoggerRepositoryPtr hierarchy)