rjob 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67a4a72affcc79b586581b3136af0ab5ec4ff859fcfc132511863c47c2fcef50
-  data.tar.gz: 9afb72bca1e26e14d9ba9f1d1c6f4fd412e9a0c26c59dd8e5be0ac48f394f4b9
+  metadata.gz: 241a7f0d98e6dc11f560e683e7454be5bc7c8864d39086fa1d7ff67974263051
+  data.tar.gz: cc6cd740afdc6fd9d61d7a427902edea296da4623d5cf7ec8f197ddfad522f0c
 SHA512:
-  metadata.gz: 4914696405b65c9cd6515309788f062a8770007d9d8c847b0833f88a5bdacb61eeee455c6f20d9699124848023901eb8b35902a3f57452cd93e5c842aaa0fbcf
-  data.tar.gz: 794b4f4e1c12e96d2f20e5e18eae379dace7ad9e58a9a7a47ad203a801c5ddc74e04afdf42814d5c518ccd67c8f55b8946cb94f2b7ec2fbf675ab1f2bfd13c91
+  metadata.gz: 226a74975a3287b9cb0b50e63091edd909f84d033ddd5351c2e2d3f42f2be7acd127ee6ec57d49422147af294c991f3b6840a8f0844db0efa125bb1a7758dce5
+  data.tar.gz: d840b6e43f97320212b90d1220e2afe1a61f92a21b4617d87ef39484d88f4bd2c34e81367450ca4b7e5a3f1e1029be267aaba76c58e85f2b82094f5c1536c26c

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.5.0".freeze
+  VERSION = "0.5.1".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
@@ -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)
 
@@ -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.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - André D. Piske
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-30 00:00:00.000000000 Z
+date: 2021-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj