[whimsy] branch master updated: Try kinder kill

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new 90a30b3b Try kinder kill
90a30b3b is described below

commit 90a30b3bfb6214eede16884d31c4918220be69b7
Author: Sebb <se...@apache.org>
AuthorDate: Sun May 22 20:06:30 2022 +0100

    Try kinder kill
---
 tools/site-scan.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index 7ef030a8..e21e5fb3 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -194,7 +194,9 @@ def exec_with_timeout(cmd, timeout)
     puts "WARN: timeout scanning #{cmd[-1]}"
     $stderr.puts "WARN: timeout scanning #{cmd[-1]}"
     stderr = 'Timeout'
-    Process.kill(-9, pid)
+    # try using less drastic kill
+    Process.kill(-2, pid) # INT
+    Process.kill(-15, pid) # TERM
     Process.detach(pid)
   ensure
     wout.close unless wout.closed?