resque-job_history 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4310f92699cf53011dccc817c8e4588c4567852
-  data.tar.gz: 115ff043384828b68eae3e218047be7a518ee6ae
+  metadata.gz: b4301532dbe01fd400f2fdd276beab3a790ab5f4
+  data.tar.gz: 885590015fe0fda02175694da4b1e6e3fdfc75cd
 SHA512:
-  metadata.gz: 6d2c1ea17b38c8cf3084ff3eeaf0d0fdbe12c42ff2db931445f8d0db69ec7b4e5e35e11a27370cfdc68e72ba897563f6e1d2157d5d5e90650d544f39bd31d019
-  data.tar.gz: 7df391e8650d8775d8eb0a8c76bc32bc463aed5d3914235fafd233d8d70bafe39f0db04dc0a691d1434be8b58d512a87d784db077e394884785834b1f42762f8
+  metadata.gz: fad42f3ef35691176c320fe33a5c55023664b0c29dbac8484982f86fd2c9e784097bc4be5d8e98ff74c309aa576182c295c27294ceac64bbc7dbf0d266ddda75
+  data.tar.gz: 8d1d05c15bd9f3ac0f9b277737862913b45483d837bd417dc8e99b75dbbf6deea56fbdf8231ee38ea1b829fe4553bed8192fd9ec92c9911410b59e6f568ef39e

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

@@ -70,7 +70,7 @@ module Resque
         end
 
         def failed(exception)
-          redis.hset(job_key, "error", exception.message)
+          redis.hset(job_key, "error", exception_message(exception))
           redis.incr(total_failed_key)
 
           finish
@@ -113,6 +113,15 @@ module Resque
 
         private
 
+        def exception_message(exception)
+          if exception.is_a?(Resque::DirtyExit)
+            ("#{exception.message}\n\n#{exception.process_status&.message}\n\n" +
+                Array.wrap(exception.process_status&.backtrace).join("\n")).strip
+          else
+            exception.message
+          end
+        end
+
         def remove_from_job_lists
           running_jobs.remove_job(job_id)
           finished_jobs.remove_job(job_id)

data/lib/resque/plugins/job_history.rb

@@ -38,8 +38,22 @@ module Resque
       # The class methods added to the job class that is being enqueued and whose history is to be
       # recorded.
       module ClassMethods
+        def on_failure_job_history(error, *args)
+          job_class_name = active_job_class_name(*args)
+          job_args       = *active_job_args(*args)
+
+          failed_job = find_failed_job(job_args, job_class_name)
+
+          return unless failed_job
+          return if failed_job.finished? && failed_job.error.present?
+
+          failed_job.failed(error)
+        end
+
         def around_perform_job_history(*args)
-          running_job = Resque::Plugins::JobHistory::Job.new(active_job_class_name(*args), SecureRandom.uuid)
+          running_job          = Resque::Plugins::JobHistory::Job.new(active_job_class_name(*args),
+                                                                      SecureRandom.uuid)
+          self.most_recent_job = running_job
 
           begin
             running_job.start(*active_job_args(*args))
@@ -52,6 +66,7 @@ module Resque
             raise
           ensure
             running_job.cancel unless running_job.finished? || running_job.error
+            self.most_recent_job = nil
           end
         end
 
@@ -75,6 +90,14 @@ module Resque
           Resque::Plugins::JobHistory::HistoryDetails.new(name)
         end
 
+        def most_recent_job=(job)
+          @most_recent_job = job
+        end
+
+        def most_recent_job
+          @most_recent_job
+        end
+
         private
 
         def job_class_has_history?(*args)
@@ -103,6 +126,19 @@ module Resque
             args
           end
         end
+
+        def find_failed_job(job_args, job_class_name)
+          recent_job = most_recent_job
+
+          if recent_job&.class_name == job_class_name && recent_job&.args == job_args
+            recent_job
+          else
+            running_list  = HistoryList.new(job_class_name, "running")
+            possible_jobs = running_list.jobs.select { |job| job.args == job_args }
+
+            possible_jobs.length == 1 ? possible_jobs.first : nil
+          end
+        end
       end
     end
   end

data/lib/resque/plugins/version.rb

@@ -3,7 +3,7 @@
 module Resque
   module Plugins
     module JobHistory
-      VERSION = "0.0.12"
+      VERSION = "0.0.13"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque-job_history
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - RealNobody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque