resque-job_history 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 272a762705e9396cae975b8113183ae579557cf0e77412b6f4c1cb609ff0ff96
-  data.tar.gz: c9e0df1f067302a22ee086413f9fa57ae7a56f84cef52d29c27e5dc372336112
+  metadata.gz: 6d328ea1b14c7876088234d1c4d3640423ab2f8059006eaadbf908ca73275afa
+  data.tar.gz: d59d30e5ddc0d79bb6812b17f5f5236aa8cda1ea973c699ce32576718257bbcf
 SHA512:
-  metadata.gz: c5cb6a16f6808621408467ed6658822394c1b0eb395589dad5d41657747877b032dc17a12efea5915b8d4ea046b3d95c1af03db36d14b847a33b2b442b95dbe2
-  data.tar.gz: df26c5d144fd44da9f331399cd57e71fc9e0972fee60d7c304a5ed5a08eb2fa6599814870f1027d4263839c16620ee222358e6d1995c4e4c1c5f311f443c2332
+  metadata.gz: f0ae0984ef34a9a40519d68cbc9e0338b414df97b52f130dec1e3c5a2e547bccdd84330f2966cd8518c4731bdba3684ce408034cadebb9b9ca96f523649d2809
+  data.tar.gz: da4a3ce71e67a2aaeca3784fb29accf6075aeb70b2c087d4790b3713997626aa14d9ade0a02efe1152f58a4a01901906ad701f5598a199e037076cbe4df1a267

data/lib/resque/plugins/job_history.rb

@@ -65,7 +65,10 @@ module Resque
             running_job.failed exception, start_time, *args
             raise
           ensure
-            running_job.cancel(" Job did not signal completion on finish.", start_time, *args) unless running_job.finished? || running_job.error
+            if running_job.present? && !running_job.finished? && !running_job.error
+              running_job.cancel(" Job did not signal completion on finish.", start_time, *args)
+            end
+
             self.most_recent_job = nil
           end
         end

data/lib/resque/plugins/job_history/job.rb

@@ -28,6 +28,10 @@ module Resque
           stored_values[:end_time].present?
         end
 
+        def blank?
+          !redis.exists job_key
+        end
+
         def succeeded?
           error.blank?
         end
@@ -72,7 +76,7 @@ module Resque
             record_job_start(start_time, *args)
           end
 
-          if redis.exists(job_key)
+          if present?
             redis.hset(job_key, "end_time", Time.now.utc.to_s)
             finished_jobs.add_job(job_id, class_name)
           end
@@ -89,7 +93,7 @@ module Resque
             record_job_start(start_time, *args)
           end
 
-          redis.hset(job_key, "error", exception_message(exception)) if redis.exists(job_key)
+          redis.hset(job_key, "error", exception_message(exception)) if present?
           redis.incr(total_failed_key)
 
           finish
@@ -106,7 +110,7 @@ module Resque
             record_job_start(start_time, *args)
           end
 
-          if redis.exists(job_key)
+          if present?
             redis.hset(job_key,
                        "error",
                        "Unknown - Job failed to signal ending after the configured purge time or was canceled manually.#{caller_message}")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-job_history
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - RealNobody