rjob 0.5.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3499587dfa6fa5db867d088dfc0f48757a204df0cd07a252c3f880ce827effe6
-  data.tar.gz: 6ff88dc58d9e39eb337980b4fe1241bd3afb493cd15aff370ab463e4b2d086b6
+  metadata.gz: a449a71e4bc05ab0aa01d605cfd96ef3e1133377829750749c2c8cf0759a11d2
+  data.tar.gz: 0fbe17674cc2dbb924c85b431a0160afc85eee4cc9598923c2bf6c61a5af9530
 SHA512:
-  metadata.gz: 77d9c95f465434e5efc942b5dca1a98c64bc2f15c2c12691b258f993569c68c29f1146958e8856633e9bee32bcc82119d687b3ee37a29eb6fa5163238eeacf08
-  data.tar.gz: 523ff1e067f99d9fb632c248d7b07157112d0d6197574e717d319900f76e8c646698f692388760dccb521abfbf36f88fe01b5c01614ec71f0b28fcf7319c5a71
+  metadata.gz: b3079717e2b8cf013a383b4026794af68c2b52aece9633be7bc1aa3880161091b78dd4a9d717754a0e61de1cfe6492969ab2bd92781c948beb03cda7258c3a7e
+  data.tar.gz: 3a7578b5135a1b7932e6c88b40111bf529068b950f71497ea423a1ae85d3ee502cca5e505bd1a2bafadaa34378e71a7fb970e0c54d963c53566f0a9625cd21f9

data/lib/rjob/context.rb

@@ -58,6 +58,27 @@ class Rjob::Context
     load_redis_scripts
   end
 
+  def dead_job_count()
+    redis { |r| r.llen("#{@prefix}:dead") }
+  end
+
+  def get_dead_jobs(count=1, offset=0, keyname: 'ohh-dead')
+    redis do |r|
+      # dead_jobs = r.lrange("#{@prefix}:dead", offset, count < 0 ? -1 : (offset + count - 1))
+      dead_jobs = r.lrange(keyname, offset, count < 0 ? -1 : (offset + count - 1))
+      dead_jobs.map do |error_payload|
+        payload = MessagePack.unpack(error_payload)
+
+        {
+          job: Rjob::Job.deserialize(self, payload['job']),
+          when: Time.at(payload['when']),
+          error_class: payload['error_class'],
+          full_message: payload['message'],
+        }
+      end
+    end
+  end
+
   def redis(&block)
     @pool.with(&block)
   end

data/lib/rjob/scripts/enqueue_job.rb

@@ -14,7 +14,7 @@ class Rjob::Scripts::EnqueueJob < Rjob::Scripts::RedisScript
       local job_id = r.call('incr', prefix .. ':next')
       local bucket = job_id % bucket_count
       r.call('lpush', prefix .. ':jobs:' .. bucket, job_id .. '!0!' .. job_data)
-      r.call('publish', prefix .. ':jobs', bucket)
+      r.call('publish', prefix .. ':jobs', tostring(bucket))
       return job_id
     LUA
   end

data/lib/rjob/scripts/scan_buckets.rb

@@ -14,7 +14,7 @@ class Rjob::Scripts::ScanBuckets < Rjob::Scripts::RedisScript
       for i=0,bucket_count-1 do
         local len = r.call('llen', prefix .. ':jobs:' .. i)
         if len > 0 then
-          r.call('publish', prefix .. ':jobs', i)
+          r.call('publish', prefix .. ':jobs', tostring(i))
         end
       end
       return 1

data/lib/rjob/version.rb

@@ -1,4 +1,4 @@
 
 module Rjob
-  VERSION = "0.5.2".freeze
+  VERSION = "0.5.4".freeze
 end

data/lib/rjob/worker_process.rb

@@ -81,12 +81,10 @@ class Rjob::WorkerProcess
       begin
         @pubsub_redis.subscribe("#{@prefix}:jobs") do |on|
           on.message do |_, bucket_no|
-            loop do
-              break unless @state == :running
+            @pubsub_redis.unsubscribe unless @state == :running
 
-              @subscription_mutex.synchronize do
-                break unless start_processing_message_from_bucket(bucket_no)
-              end
+            @subscription_mutex.synchronize do
+              start_processing_message_from_bucket(bucket_no)
             end
           end
         end
@@ -250,6 +248,7 @@ class Rjob::WorkerProcess
 
     if job_processor.stop_retry?
       move_job_to_dead(job_processor.job_str, bucket, error)
+      notify_job_is_dead(job_processor, error)
       return
     end
 
@@ -272,6 +271,24 @@ class Rjob::WorkerProcess
     end
 
     move_job_to_dead(job_processor.job_str, bucket, error)
+    notify_job_is_dead(job_processor, error)
+  end
+
+  def notify_job_is_dead(job_processor, error)
+    if defined?(Honeybadger)
+      job = job_processor.job
+
+      Honeybadger.notify(error, context: {
+        what: 'RJOB_MOVED_TO_DEAD',
+        rjob_class: job.worker_class_name,
+        rjob_args: job.worker_args
+      })
+    end
+  rescue StandardError => e
+    if @context.logger.respond_to?(:error)
+      s = job_processor.respond_to?(:job_str) ? job_processor.job_str : '<unknown>'
+      @context.logger.error("UGHH! Error while notifying dead job error: #{s}")
+    end
   end
 
   # TODO: this should probably be in a single redis pipelined operation

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rjob
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.4
 platform: ruby
 authors:
 - André D. Piske
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-08 00:00:00.000000000 Z
+date: 2023-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -131,7 +131,7 @@ homepage: https://gitlab.com/andrepiske/rjob
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -146,8 +146,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.11
-signing_key: 
+rubygems_version: 3.4.20
+signing_key:
 specification_version: 4
 summary: Asynchronous job processing
 test_files: []