rjob 0.5.4 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a449a71e4bc05ab0aa01d605cfd96ef3e1133377829750749c2c8cf0759a11d2
-  data.tar.gz: 0fbe17674cc2dbb924c85b431a0160afc85eee4cc9598923c2bf6c61a5af9530
+  metadata.gz: 9bebd5026b07c43eca2bc4aacb4d11ea44fc4f5534df2dc4504617bb879f8767
+  data.tar.gz: 40bc336b11fd755eead4b65f08a9e747da34d424e6c7af13ad1d90cfd8d3f355
 SHA512:
-  metadata.gz: b3079717e2b8cf013a383b4026794af68c2b52aece9633be7bc1aa3880161091b78dd4a9d717754a0e61de1cfe6492969ab2bd92781c948beb03cda7258c3a7e
-  data.tar.gz: 3a7578b5135a1b7932e6c88b40111bf529068b950f71497ea423a1ae85d3ee502cca5e505bd1a2bafadaa34378e71a7fb970e0c54d963c53566f0a9625cd21f9
+  metadata.gz: ba483620e0863dae21b9b648e17b8e820d4672a79670290d9f32b661793dbf3148cb47c7e54efe4a563c929c908443acdfef46c699f97b889049c6cd74e150c8
+  data.tar.gz: 10cd5379b8e0aea0d2b7e6e0eec1ca66f5bb9e33f477e6ed07994bf7a7f1888fd9d765f99fa7291f107773534760ebf4415b3158aefde9db86b7d1a40891ec05

data/lib/rjob/cli.rb

@@ -26,6 +26,8 @@ class Rjob::CLI
       require r
     end
 
+    Rjob::Context.instance.logger.info("Booting up rjob") if Rjob::Context.instance.logger
+
     run_workers if @run_workers
   end
 

data/lib/rjob/version.rb

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

data/lib/rjob/worker_process.rb

@@ -37,6 +37,14 @@ class Rjob::WorkerProcess
     @failed_count = Concurrent::AtomicFixnum.new
     @returned_count = Concurrent::AtomicFixnum.new
 
+    if @context.logger
+      if @context.logger.debug?
+        @context.logger.debug("rjob worker process start with prefix=#{@prefix}, max_threads=#{max_threads}")
+      else
+        @context.logger.info("rjob worker process start")
+      end
+    end
+
     @leader = nil
     @state = :new
   end
@@ -46,11 +54,11 @@ class Rjob::WorkerProcess
 
     Signal.trap("INT") do
       if @state == :exiting
-        puts "Force exit requested. Exiting immediately"
-        exit 1
+        puts("Force exit requested. Exiting immediately")
+        exit(1)
       else
         @state = :exiting
-        puts "Exiting..."
+        puts("Exiting...")
       end
     end
 
@@ -114,11 +122,13 @@ class Rjob::WorkerProcess
 
     if @state == :exiting
       if @thread_pool.shutdown?
+        @context.logger.info("rjob successfully exiting now") if @context.logger
         @state = :exited
       elsif !@thread_pool.shuttingdown?
         @thread_pool.shutdown
       else
         puts "Waiting shutdown..."
+        @context.logger.info("rjob waiting for shutdown...") if @context.logger
       end
     end
 
@@ -242,7 +252,7 @@ class Rjob::WorkerProcess
       error = { message: "Unknown error" }
     end
 
-    if @context.logger.respond_to?(:info)
+    if @context.logger&.info?
       @context.logger.info("Job '#{job.worker_class_name}' with args '#{job.worker_args}' failed: #{error}")
     end
 
@@ -255,6 +265,10 @@ class Rjob::WorkerProcess
     retry_options = job.worker_class.retry_options
 
     if retry_options[:retry]
+      if retry_options[:retry].is_a?(Hash)
+        retry_options = retry_options.merge(retry: true).merge(retry_options[:retry])
+      end
+
       exceptions = retry_options.fetch(:exceptions, [StandardError])
       should_handle = exceptions.any? { |e| e >= error[:error_class] }
 
@@ -287,7 +301,9 @@ class Rjob::WorkerProcess
   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}")
+      msg = "UGHH! Error while notifying dead job error: #{s}"
+      puts(msg)
+      @context.logger.error(msg) if @context.logger
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rjob
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.6
 platform: ruby
 authors:
 - André D. Piske
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-12 00:00:00.000000000 Z
+date: 2024-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -45,6 +45,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.5
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,6 +55,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.5
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: Asynchronous job processing