From f30d759c08b3ddaf9ec5ad52f5f77f90f45db310 Mon Sep 17 00:00:00 2001 From: Pavle Dragisic Date: Tue, 21 Nov 2023 06:36:36 +0100 Subject: [PATCH] Virtualize ServerApplication::handlePidFile() (#4223) * feat(OptionSet): Add replaceOption() #4181 * revert changes #4181 * feat: make ServerApplication::handlePidFile virtual #4181 * move handlePidFile() out of ifdef #4181 * fix(ServerApplication): move handlePidFile() out of all ifdefs #4181 --------- Co-authored-by: Pavle Co-authored-by: Aleksandar Fabijanic --- Util/include/Poco/Util/ServerApplication.h | 2 +- Util/src/ServerApplication.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Util/include/Poco/Util/ServerApplication.h b/Util/include/Poco/Util/ServerApplication.h index 85c4ed19d..ae5cea0f1 100644 --- a/Util/include/Poco/Util/ServerApplication.h +++ b/Util/include/Poco/Util/ServerApplication.h @@ -166,12 +166,12 @@ protected: #endif private: + virtual void handlePidFile(const std::string& name, const std::string& value); #if defined(POCO_VXWORKS) static Poco::Event _terminate; #elif defined(POCO_OS_FAMILY_UNIX) void handleDaemon(const std::string& name, const std::string& value); void handleUMask(const std::string& name, const std::string& value); - void handlePidFile(const std::string& name, const std::string& value); bool isDaemon(int argc, char** argv); void beDaemon(); #if POCO_OS == POCO_OS_ANDROID diff --git a/Util/src/ServerApplication.cpp b/Util/src/ServerApplication.cpp index af373113f..0d2245c1c 100644 --- a/Util/src/ServerApplication.cpp +++ b/Util/src/ServerApplication.cpp @@ -16,6 +16,7 @@ #include "Poco/Util/Option.h" #include "Poco/Util/OptionSet.h" #include "Poco/Util/OptionException.h" +#include "Poco/TemporaryFile.h" #include "Poco/FileStream.h" #include "Poco/Exception.h" #if !defined(POCO_VXWORKS) @@ -26,7 +27,6 @@ #include "Poco/Logger.h" #include "Poco/String.h" #if defined(POCO_OS_FAMILY_UNIX) && !defined(POCO_VXWORKS) -#include "Poco/TemporaryFile.h" #include #include #include @@ -706,6 +706,9 @@ void ServerApplication::handleUMask(const std::string& name, const std::string& } +#endif + + void ServerApplication::handlePidFile(const std::string& name, const std::string& value) { Poco::FileOutputStream ostr(value); @@ -717,7 +720,4 @@ void ServerApplication::handlePidFile(const std::string& name, const std::string } -#endif - - } } // namespace Poco::Util