From a6ea55d16fb0060b8ee0a322bede1951cff51fba Mon Sep 17 00:00:00 2001
From: Stefan Kempf <sn.kempf@t-online.de>
Date: Tue, 10 Nov 2015 18:44:28 +0100
Subject: [PATCH] Process.kill to check for process is more portable.

On OpenBSD, you can only use getpgid(pid) if the calling process
belongs to the same session as the the process with the PID `pid'.
Otherwise getpgid() returns EPERM.

Using kill(0, pid) is a more portable way to check whether a process
exists.
---
 bin/sidekiqctl | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/bin/sidekiqctl b/bin/sidekiqctl
index 7ad5f77a..e9854680 100755
--- a/bin/sidekiqctl
+++ b/bin/sidekiqctl
@@ -41,9 +41,13 @@ class Sidekiqctl
   end
 
   def fetch_process
-    Process.getpgid(pid)
+    Process.kill(0, pid)
   rescue Errno::ESRCH
     done "Process doesn't exist", :error
+  # We were not allowed to send a signal, but the process must have existed
+  # when Process.kill() was called.
+  rescue Errno::EPERM
+    return pid
   end
 
   def done(msg, error = nil)
@@ -67,10 +71,12 @@ class Sidekiqctl
     `kill -TERM #{pid}`
     kill_timeout.times do
       begin
-        Process.getpgid(pid)
+        Process.kill(0, pid)
       rescue Errno::ESRCH
         FileUtils.rm_f pidfile
         done 'Sidekiq shut down gracefully.'
+      rescue Errno::EPERM
+        done 'Not permitted to shut down Sidekiq.'
       end
       sleep 1
     end