From 6e816bb769f855caa53464a0a09c4e0843712d05 Mon Sep 17 00:00:00 2001
From: b123400 <i@b123400.net>
Date: Wed, 6 Dec 2023 22:07:21 +0900
Subject: [PATCH 1/3] Delete job pid if such process doesn't exist

---
 src/util/job.rb | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/util/job.rb b/src/util/job.rb
index 4e356b3c..e1826666 100644
--- a/src/util/job.rb
+++ b/src/util/job.rb
@@ -69,9 +69,18 @@ def Job.running_job
         values =[]
       end
       if values.length == 3
-        keys  = [:pid, :basename, :time]
-        array = [keys, values].transpose.flatten
-        @running_job = Hash[*array]
+        pid = values[0]
+        puts "Found pid #{pid} in job.pid"
+        if (Process.getpgid(pid.to_i) rescue nil)
+          process = Process.getpgid(pid.to_i) rescue nil
+          puts "Job #{process} is running"
+          keys  = [:pid, :basename, :time]
+          array = [keys, values].transpose.flatten
+          @running_job = Hash[*array]
+        else
+          puts "Job is not running, deleting staled pid file"
+          File.unlink(PID_FILE)
+        end
       end
     end
     @running_job

From 3344cc48383a936ba424d492fe69acea4a199814 Mon Sep 17 00:00:00 2001
From: b123400 <i@b123400.net>
Date: Thu, 7 Dec 2023 15:47:13 +0900
Subject: [PATCH 2/3] Revert "Bump rmagick from 4.2.4 to 5.3.0"

This reverts commit 30fe9c2057714e515720e3509850793471ee150f.
---
 Gemfile.lock | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 55758107..756dfa88 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -131,7 +131,6 @@ GEM
     paypal (2.0.0)
       money (> 0.0.0)
     pg (1.4.5)
-    pkg-config (1.5.5)
     public_suffix (4.0.7)
     racc (1.7.1)
     rack (2.2.6.4)
@@ -146,8 +145,7 @@ GEM
     rclconf (1.0.0)
     regexp_parser (2.2.0)
     rexml (3.2.5)
-    rmagick (5.3.0)
-      pkg-config (~> 1.4)
+    rmagick (4.2.4)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)

From 4a85791815c4db0b4fa638945c024a3f560bcdc0 Mon Sep 17 00:00:00 2001
From: b123400 <i@b123400.net>
Date: Thu, 7 Dec 2023 15:56:29 +0900
Subject: [PATCH 3/3] Fix rmagick to 4.2.4 for CI

---
 Gemfile      | 2 +-
 Gemfile.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 755bcc4f..947043d2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -43,7 +43,7 @@ gem 'paypal'
 gem 'parslet'
 gem 'pg'
 gem 'rclconf'
-gem 'rmagick'
+gem 'rmagick', '4.2.4'
 gem 'racc'
 gem 'rack'
 gem 'rackup'
diff --git a/Gemfile.lock b/Gemfile.lock
index 756dfa88..12fa675e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -320,7 +320,7 @@ DEPENDENCIES
   rake
   rbs
   rclconf
-  rmagick
+  rmagick (= 4.2.4)
   rspec
   rspec-core
   rss