[Libreoffice-commits] online.git: common/SigUtil.cpp
Ashod Nakashian (via logerrit)
logerrit at kemper.freedesktop.org
Mon Nov 25 16:06:36 UTC 2019
common/SigUtil.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a5946b46250a7fd4a63f16c6c0606b0147b13e79
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Mon Nov 25 10:49:57 2019 -0500
Commit: Ashod Nakashian <ashnakash at gmail.com>
CommitDate: Mon Nov 25 17:06:19 2019 +0100
wsd: use SIGKILL to kill a child
This is the cleanest way to achieve the goal
of immediately exiting a child. This is used
for cleaning up kit instances when closing
docs, as well as in unit-tests.
Change-Id: I76870234b130a508044044b102419646abe81ac8
Reviewed-on: https://gerrit.libreoffice.org/83699
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
Tested-by: Ashod Nakashian <ashnakash at gmail.com>
diff --git a/common/SigUtil.cpp b/common/SigUtil.cpp
index 59c133771..f511aca60 100644
--- a/common/SigUtil.cpp
+++ b/common/SigUtil.cpp
@@ -346,7 +346,7 @@ namespace SigUtil
bool killChild(const int pid)
{
LOG_DBG("Killing PID: " << pid);
- if (kill(pid, SIGABRT) == 0 || errno == ESRCH)
+ if (kill(pid, SIGKILL) == 0 || errno == ESRCH)
{
// Killed or doesn't exist.
return true;
More information about the Libreoffice-commits
mailing list