rjob 0.4.4 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e13e3bdb56490d8d69d74ca45483eb53c53bbe5510d0155f1f8edabe309171ab
-  data.tar.gz: 9ebca9b23880e8cf3c682d9d63b8a34bd8c444873c983e5196914b0169202676
+  metadata.gz: 3499587dfa6fa5db867d088dfc0f48757a204df0cd07a252c3f880ce827effe6
+  data.tar.gz: 6ff88dc58d9e39eb337980b4fe1241bd3afb493cd15aff370ab463e4b2d086b6
 SHA512:
-  metadata.gz: eb27291eb3a62b0e64ea79a21769b7ef1358d62a5bea4b47a0c2dfe90795943e6ef85c23aaa805655637771802999e7da617a689e7fdbd1fc1e1dec1178adb26
-  data.tar.gz: f9887d29d557888890c6f657a374d481dff1643eedaaf7f66b87b8357b51a1eb8737e929096730c55dd4e5e504f525b7b98153138ad8ee2c4b8bbd740fec50ab
+  metadata.gz: 77d9c95f465434e5efc942b5dca1a98c64bc2f15c2c12691b258f993569c68c29f1146958e8856633e9bee32bcc82119d687b3ee37a29eb6fa5163238eeacf08
+  data.tar.gz: 523ff1e067f99d9fb632c248d7b07157112d0d6197574e717d319900f76e8c646698f692388760dccb521abfbf36f88fe01b5c01614ec71f0b28fcf7319c5a71

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/version.rb

@@ -1,4 +1,4 @@
 
 module Rjob
-  VERSION = "0.4.4".freeze
+  VERSION = "0.5.2".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
 
@@ -79,7 +83,10 @@ class Rjob::WorkerProcess
           on.message do |_, bucket_no|
             loop do
               break unless @state == :running
-              break unless start_processing_message_from_bucket(bucket_no)
+
+              @subscription_mutex.synchronize do
+                break unless start_processing_message_from_bucket(bucket_no)
+              end
             end
           end
         end
@@ -91,45 +98,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 +169,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 +190,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 +208,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 +227,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.4.4
+  version: 0.5.2
 platform: ruby
 authors:
 - André D. Piske
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-19 00:00:00.000000000 Z
+date: 2022-04-08 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:
@@ -142,7 +128,8 @@ files:
 - lib/rjob/worker.rb
 - lib/rjob/worker_process.rb
 homepage: https://gitlab.com/andrepiske/rjob
-licenses: []
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -159,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.18
+rubygems_version: 3.3.11
 signing_key: 
 specification_version: 4
 summary: Asynchronous job processing