[Libreoffice-commits] online.git: common/SigUtil.cpp

Ashod Nakashian (via logerrit) logerrit at kemper.freedesktop.org
Thu Nov 21 08:19:34 UTC 2019


 common/SigUtil.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 876897ce9620693f92b8345b4d5ee3d1a4407fee
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Thu Nov 21 01:08:41 2019 -0500
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Nov 21 09:18:50 2019 +0100

    wsd: kill with SIGABRT now that SIGTERM cleanly shutsdown
    
    Change-Id: I198795be0cc399703f3207456ef0bfd1e3c3c844
    Reviewed-on: https://gerrit.libreoffice.org/83359
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/common/SigUtil.cpp b/common/SigUtil.cpp
index c24ffb9d5..59c133771 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, SIGTERM) == 0 || errno == ESRCH)
+        if (kill(pid, SIGABRT) == 0 || errno == ESRCH)
         {
             // Killed or doesn't exist.
             return true;


More information about the Libreoffice-commits mailing list