loolwsd/LOOLWSD.cpp | 5 ++++- loolwsd/common/SigUtil.cpp | 12 ------------ loolwsd/common/SigUtil.hpp | 2 -- 3 files changed, 4 insertions(+), 15 deletions(-)
New commits: commit d82e767172ce0004734b43e63fd3b7a7e86f5129 Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk> Date: Tue Nov 15 22:13:22 2016 -0500 loolwsd: use own killChild instead of Poco wrapper Change-Id: Ic0e09076535d58bbf7ec86962878f534825dfc65 Reviewed-on: https://gerrit.libreoffice.org/30893 Reviewed-by: Ashod Nakashian <ashnak...@gmail.com> Tested-by: Ashod Nakashian <ashnak...@gmail.com> diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp index c0d19aa..bbbf24c 100644 --- a/loolwsd/LOOLWSD.cpp +++ b/loolwsd/LOOLWSD.cpp @@ -2088,7 +2088,10 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/) // Terminate child processes LOG_INF("Requesting forkit process " << forKitPid << " to terminate."); - SigUtil::requestTermination(forKitPid); + SigUtil::killChild(forKitPid); + + // Terminate child processes + LOG_INF("Requesting child processes to terminate."); for (auto& child : NewChildren) { child->close(true); diff --git a/loolwsd/common/SigUtil.cpp b/loolwsd/common/SigUtil.cpp index 7931776..8d884bf 100644 --- a/loolwsd/common/SigUtil.cpp +++ b/loolwsd/common/SigUtil.cpp @@ -242,18 +242,6 @@ namespace SigUtil strncpy(FatalGdbString, streamStr.c_str(), sizeof(FatalGdbString)); } - void requestTermination(const Poco::Process::PID& pid) - { - try - { - Poco::Process::requestTermination(pid); - } - catch(const Poco::Exception& exc) - { - Log::warn("Util::requestTermination: Exception: " + exc.message()); - } - } - bool killChild(const int pid) { LOG_DBG("Killing PID: " << pid); diff --git a/loolwsd/common/SigUtil.hpp b/loolwsd/common/SigUtil.hpp index 13082cf..e1221b3 100644 --- a/loolwsd/common/SigUtil.hpp +++ b/loolwsd/common/SigUtil.hpp @@ -37,8 +37,6 @@ namespace SigUtil /// Trap all fatal signals to assist debugging. void setFatalSignals(); - void requestTermination(const Poco::Process::PID& pid); - /// Kills a child process and returns true when /// child pid is removed from the process table /// after a certain (short) timeout. _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits