rjob 0.5.0 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67a4a72affcc79b586581b3136af0ab5ec4ff859fcfc132511863c47c2fcef50
-  data.tar.gz: 9afb72bca1e26e14d9ba9f1d1c6f4fd412e9a0c26c59dd8e5be0ac48f394f4b9
+  metadata.gz: 364e6b6c660f7b3fc31a24a1bd86942a7900aed84146ecf0a5fa3799653966b9
+  data.tar.gz: d450f1b80a5854b59d49c9bd9ca3f8df1c05b4dffe5d7e202efb95d15740e5e9
 SHA512:
-  metadata.gz: 4914696405b65c9cd6515309788f062a8770007d9d8c847b0833f88a5bdacb61eeee455c6f20d9699124848023901eb8b35902a3f57452cd93e5c842aaa0fbcf
-  data.tar.gz: 794b4f4e1c12e96d2f20e5e18eae379dace7ad9e58a9a7a47ad203a801c5ddc74e04afdf42814d5c518ccd67c8f55b8946cb94f2b7ec2fbf675ab1f2bfd13c91
+  metadata.gz: 2c2f0b54f42c2eaa8aac6b2b09dcb12adffce5763be7d89878971c9afc22460f73b4728f1bab42756fbf13bb4fe92d47a86f7ae41e759710faca153f958e861d
+  data.tar.gz: 06e74cef1bb61d06eaaa005dcf13be78465d016308025fde8af8a7035259645aadbbc2561fbf68db8745465500525495342ecd30db94915f4501dc2a09b4e0f2

data/lib/rjob/job.rb

@@ -30,7 +30,7 @@ class Rjob::Job
   end
 
   def serialize
-    "#{@id}!#{@retry_num}!#{@payload}".force_encoding(Encoding::ASCII_8BIT)
+    "#{@id}!#{@retry_num}!#{@payload}".b
   end
 
   def self.deserialize(context, job_str)

data/lib/rjob/recurring_job.rb

@@ -20,7 +20,7 @@ class Rjob::RecurringJob
   end
 
   def maybe_enqueue(redis)
-    key_name = "#{@context.prefix}:recurring:1:#{@unique_id}:lastrun"
+    key_name = "#{@context.prefix}:recurring:1:#{@unique_id}:lastrun".b
     current_time = Time.now
 
     last_run_str = redis.get(key_name)

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.0".freeze
+  VERSION = "0.5.3".freeze
 end

data/lib/rjob/worker_process.rb

@@ -24,6 +24,7 @@ class Rjob::WorkerProcess
     @max_queue_size = 20
     max_threads = @context.config.fetch(:max_threads, 2)
 
+    @subscription_mutex = Mutex.new
     @subscription_thread = nil
     @thread_pool = Concurrent::ThreadPoolExecutor.new(
       min_threads: [2, max_threads].min,
@@ -66,7 +67,10 @@ class Rjob::WorkerProcess
 
   def disable_subscription_thread
     return unless @subscription_thread
-    @subscription_thread.raise(StopSubscription.new)
+    @subscription_mutex.synchronize do
+      @subscription_thread.raise(StopSubscription.new)
+    end
+
     @subscription_thread = nil
   end
 
@@ -77,9 +81,10 @@ class Rjob::WorkerProcess
       begin
         @pubsub_redis.subscribe("#{@prefix}:jobs") do |on|
           on.message do |_, bucket_no|
-            loop do
-              break unless @state == :running
-              break unless start_processing_message_from_bucket(bucket_no)
+            @pubsub_redis.unsubscribe unless @state == :running
+
+            @subscription_mutex.synchronize do
+              start_processing_message_from_bucket(bucket_no)
             end
           end
         end
@@ -91,45 +96,42 @@ class Rjob::WorkerProcess
         exit 1
       end
     end
+
     @subscription_thread.run
   end
 
   def run_iteration
-    begin
-      stop_threshold = (@max_queue_size * 0.7).to_i
-      if @thread_pool.queue_length >= stop_threshold || @state != :running
-        disable_subscription_thread
-      elsif @state == :running
-        if !@subscription_thread
-          enable_subscription_thread
-          sleep(ITERATION_TIMEOUT)
-          scan_buckets
-        end
+    stop_threshold = (@max_queue_size * 0.7).to_i
+    if @thread_pool.queue_length >= stop_threshold || @state != :running
+      disable_subscription_thread
+    elsif @state == :running
+      if !@subscription_thread
+        enable_subscription_thread
+        sleep(ITERATION_TIMEOUT)
+        scan_buckets
       end
+    end
 
-      if @state == :exiting
-        if @thread_pool.shutdown?
-          @state = :exited
-        elsif !@thread_pool.shuttingdown?
-          @thread_pool.shutdown
-        else
-          puts "Waiting shutdown..."
-        end
+    if @state == :exiting
+      if @thread_pool.shutdown?
+        @state = :exited
+      elsif !@thread_pool.shuttingdown?
+        @thread_pool.shutdown
+      else
+        puts "Waiting shutdown..."
       end
+    end
 
-      report_stats
-
-      check_leadership
+    report_stats
 
-      if leader? && @state == :running
-        exercise_leadership if @iteration_no % 2 == 0
-      end
+    check_leadership
 
-      @iteration_no += 1
-      sleep(ITERATION_TIMEOUT) unless @state == :exited
-    rescue StandardError => e
-      raise e
+    if leader? && @state == :running
+      exercise_leadership if @iteration_no % 2 == 0
     end
+
+    @iteration_no += 1
+    sleep(ITERATION_TIMEOUT) unless @state == :exited
   end
 
   def check_leadership
@@ -165,9 +167,9 @@ class Rjob::WorkerProcess
     }
 
     @context.redis do |r|
-      r.pipelined do
+      r.pipelined do |pl|
         state_data.each do |k, v|
-          r.hset(key_prefix, k, v.to_s)
+          pl.hset(key_prefix, k, v.to_s)
         end
       end
     end
@@ -186,6 +188,8 @@ class Rjob::WorkerProcess
 
     return false if job_str == nil
 
+    job_str = job_str.b
+
     # move to inside thread
     job_processor = Rjob::JobProcessor.new(context, job_str)
 
@@ -202,7 +206,7 @@ class Rjob::WorkerProcess
           remove_job_from_working(job_str, bucket)
         end
       end
-    rescue Concurrent::RejectedExecutionError => e
+    rescue Concurrent::RejectedExecutionError
       @returned_count.increment
       return_job_execution(job_str, bucket)
     ensure
@@ -221,8 +225,8 @@ class Rjob::WorkerProcess
       @context.script_runner.exec(r, :retry_job, [],
         [
           next_retry_at.to_s,
-          job.retry_num,
-          bucket,
+          job.retry_num.to_s,
+          bucket.to_s,
           job.id.to_s,
           job.payload,
           @prefix

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rjob
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.3
 platform: ruby
 authors:
 - André D. Piske
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-30 00:00:00.000000000 Z
+date: 2022-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -42,16 +42,16 @@ dependencies:
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 3.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 3.0.5
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -100,20 +100,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.6
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
 description: 'RJob: asynchronous job processing'
 email: andrepiske@gmail.com
 executables:
@@ -145,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
@@ -160,8 +146,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.28
-signing_key: 
+rubygems_version: 3.3.11
+signing_key:
 specification_version: 4
 summary: Asynchronous job processing
 test_files: []