resque-job_history 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74efd65b38f6d08e25d24bce58b4fafa97e3136df8c0cef2b10177af4f85f17d
-  data.tar.gz: 96e82ad40c7bd5d0371e6dc975296235e04a2e71eec4cb0646bd1f876f7cc24d
+  metadata.gz: 272a762705e9396cae975b8113183ae579557cf0e77412b6f4c1cb609ff0ff96
+  data.tar.gz: c9e0df1f067302a22ee086413f9fa57ae7a56f84cef52d29c27e5dc372336112
 SHA512:
-  metadata.gz: 82be65f4e0c8e1dbe91b237b135f1cd375c22240849cc16a549cde3481681106a126988af8c4674c6c834efa139ca48193ab0240603a1eb89a84f4d66965aaaa
-  data.tar.gz: 2de10d9d4f626e8d1ae32e1a3d4f589290badcf71979c846d353ab4b4eac7ecc183d8ebf0c97e750f85e15b95185c876f92738487aa22d3e46bd328435eedae4
+  metadata.gz: c5cb6a16f6808621408467ed6658822394c1b0eb395589dad5d41657747877b032dc17a12efea5915b8d4ea046b3d95c1af03db36d14b847a33b2b442b95dbe2
+  data.tar.gz: df26c5d144fd44da9f331399cd57e71fc9e0972fee60d7c304a5ed5a08eb2fa6599814870f1027d4263839c16620ee222358e6d1995c4e4c1c5f311f443c2332

data/lib/resque/plugins/job_history.rb

@@ -51,6 +51,7 @@ module Resque
         end
 
         def around_perform_job_history(*args)
+          start_time           = Time.now
           running_job          = Resque::Plugins::JobHistory::Job.new(active_job_class_name(*args), SecureRandom.uuid)
           self.most_recent_job = running_job
 
@@ -59,12 +60,12 @@ module Resque
 
             yield if block_given?
 
-            running_job.finish
+            running_job.finish(start_time, *args)
           rescue StandardError => exception
-            running_job.failed exception
+            running_job.failed exception, start_time, *args
             raise
           ensure
-            running_job.cancel unless running_job.finished? || running_job.error
+            running_job.cancel(" Job did not signal completion on finish.", start_time, *args) unless running_job.finished? || running_job.error
             self.most_recent_job = nil
           end
         end
@@ -99,18 +100,9 @@ module Resque
 
         private
 
-        def job_class_has_history?(*args)
-          if Object.const_defined?("ActiveJob::QueueAdapters::ResqueAdapter::JobWrapper") &&
-              self >= ActiveJob::QueueAdapters::ResqueAdapter::JobWrapper
-            args[-1]["job_class"].constantize.included_modules.include? Resque::Plugins::JobHistory
-          else
-            true
-          end
-        end
-
         def active_job_class_name(*args)
           if Object.const_defined?("ActiveJob::QueueAdapters::ResqueAdapter::JobWrapper") &&
-              self >= ActiveJob::QueueAdapters::ResqueAdapter::JobWrapper
+              self >= "ActiveJob::QueueAdapters::ResqueAdapter::JobWrapper".constantize
             args[-1]["job_class"]
           else
             name
@@ -119,7 +111,7 @@ module Resque
 
         def active_job_args(*args)
           if Object.const_defined?("ActiveJob::QueueAdapters::ResqueAdapter::JobWrapper") &&
-              self >= ActiveJob::QueueAdapters::ResqueAdapter::JobWrapper
+              self >= "ActiveJob::QueueAdapters::ResqueAdapter::JobWrapper".constantize
             args[-1]["arguments"]
           else
             args
@@ -144,8 +136,7 @@ module Resque
 end
 
 if Object.const_defined?("ActiveJob::QueueAdapters::ResqueAdapter::JobWrapper")
-  unless ActiveJob::QueueAdapters::ResqueAdapter::JobWrapper.included_modules.
-      include? Resque::Plugins::JobHistory
-    ActiveJob::QueueAdapters::ResqueAdapter::JobWrapper.include Resque::Plugins::JobHistory
+  unless "ActiveJob::QueueAdapters::ResqueAdapter::JobWrapper".constantize.included_modules.include? Resque::Plugins::JobHistory
+    "ActiveJob::QueueAdapters::ResqueAdapter::JobWrapper".constantize.include Resque::Plugins::JobHistory
   end
 end

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

@@ -109,8 +109,8 @@ module Resque
           running_jobs.jobs.each do |job|
             job_start = job.start_time
 
-            if job_start.blank? || job_start.to_time < too_old_time
-              job.cancel
+            if job_start.present? && job_start.to_time < too_old_time
+              job.cancel " Job timed out."
             end
           end
         end

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

@@ -33,7 +33,7 @@ module Resque
         end
 
         def duration
-          (end_time || Time.now) - start_time
+          (end_time || Time.now) - (start_time || Time.now)
         end
 
         def end_time
@@ -45,7 +45,7 @@ module Resque
         end
 
         def uncompressed_args
-          return args if described_class.blank?
+          return args if described_class.blank? || args.blank?
           return args unless described_class.singleton_class.included_modules.map(&:name).include?("Resque::Plugins::Compressible")
           return args unless described_class.compressed?(args)
 
@@ -57,7 +57,7 @@ module Resque
         end
 
         def start(*args)
-          record_job_start(*args)
+          record_job_start(Time.now.utc.to_s, *args)
 
           num_jobs = running_jobs.add_job(job_id, class_name)
           linear_jobs.add_job(job_id, class_name) unless class_exclude_from_linear_history
@@ -67,10 +67,16 @@ module Resque
           self
         end
 
-        def finish
-          redis.hset(job_key, "end_time", Time.now.utc.to_s)
+        def finish(start_time = nil, *args)
+          if start_time.present?
+            record_job_start(start_time, *args)
+          end
+
+          if redis.exists(job_key)
+            redis.hset(job_key, "end_time", Time.now.utc.to_s)
+            finished_jobs.add_job(job_id, class_name)
+          end
 
-          finished_jobs.add_job(job_id, class_name)
           running_jobs.remove_job(job_id)
 
           reset
@@ -78,18 +84,34 @@ module Resque
           self
         end
 
-        def failed(exception)
-          redis.hset(job_key, "error", exception_message(exception))
+        def failed(exception, start_time = nil, *args)
+          if start_time.present?
+            record_job_start(start_time, *args)
+          end
+
+          redis.hset(job_key, "error", exception_message(exception)) if redis.exists(job_key)
           redis.incr(total_failed_key)
 
           finish
         end
 
-        def cancel
-          redis.hset(job_key,
-                     "error",
-                     "Unknown - Job failed to signal ending after the configured purge time or "\
-                       "was canceled manually.")
+        def abort
+          running_jobs.remove_job(job_id)
+
+          reset
+        end
+
+        def cancel(caller_message = nil, start_time = nil, *args)
+          if start_time.present?
+            record_job_start(start_time, *args)
+          end
+
+          if redis.exists(job_key)
+            redis.hset(job_key,
+                       "error",
+                       "Unknown - Job failed to signal ending after the configured purge time or was canceled manually.#{caller_message}")
+          end
+
           redis.incr(total_failed_key)
 
           finish
@@ -111,7 +133,7 @@ module Resque
 
         def purge
           # To keep the counts honest...
-          cancel unless finished?
+          abort unless finished?
 
           remove_from_job_lists
 
@@ -136,8 +158,8 @@ module Resque
           linear_jobs.remove_job(job_id)
         end
 
-        def record_job_start(*args)
-          redis.hset(job_key, "start_time", Time.now.utc.to_s)
+        def record_job_start(start_time, *args)
+          redis.hset(job_key, "start_time", start_time)
           redis.hset(job_key, "args", encode_args(*args))
 
           reset

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque-job_history
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors:
 - RealNobody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-30 00:00:00.000000000 Z
+date: 2020-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque