workhorse 1.2.21 → 1.2.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d592413ecdd60fc3b3885fa2b8ed621fbc06a1010f6f52e6f3275164a971a2e
-  data.tar.gz: 476a0a3db5004cd9624f125d57e36fe71f09de114dbb11f9f61320f192c27291
+  metadata.gz: 20eef573615adbfed9958ae1d5f2e005cfca827060f2b632dbd17b624c2273ec
+  data.tar.gz: 3be17bded0b07b544b5d1d2978470d7684dc1d2e4ca6588b03745a02af11bfd2
 SHA512:
-  metadata.gz: ac0151e9dc1f74b7ec6d45bb52b50d63a43e1f81d45da6015582f2357b5700cf2aa366e18c9a8d819405f2bb32d00dfd1bdb7158a607559a0488b09f6eb44ff0
-  data.tar.gz: 8744eca3567ce431b193cd7b7e01a49f1004ae370ac55338af984f3c6486f1553cf8aebf47a4b47374836b28da83fac1ac21726434dfba29a4391e71a0ce932f
+  metadata.gz: 1a2c29dc077d8557b4d2ff2bdad9f980d0e24f6794f5a42d26ae731f0c8a7ba24e78d980b39ba087d985529ce701860ef9a876eba70b38c10d007f6516ed6a9b
+  data.tar.gz: 88c45f4571b11a51021accaf4145d65fe48fbad6add8170ce830ad31c7e2ddc6b7422e41f1ca1b3f6e0a2bf06351d80f77323889945f25aac16c5068ed51dff7

data/.github/workflows/ruby.yml

@@ -40,7 +40,7 @@ jobs:
         uses: nick-fields/retry@v2
         with:
           timeout_seconds: 120
-          retry_on: error
+          retry_on: any
           max_attempts: 3
           command: bundle exec rake test TESTOPTS='--verbose'
 
@@ -54,4 +54,4 @@ jobs:
           ruby-version: 2.5.1
           bundler-cache: true
       - name: Run rubocop
-        run: bundle exec rubocop
+        run: bundle exec rubocop

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Workhorse Changelog
 
+## 1.2.22 - 2024-08-20
+
+* Change `retry-on` in actions to `any`: also retry when the action hits a timeout
+
+* Comply with RuboCop
+
+* Skip `at_exit` handlers when exiting in ShellHandler
+
+  Sitrox reference: #128333.
+
 ## 1.2.21 - 2024-07-02
 
 * Add active record release to `create_table_jobs` migration

data/VERSION

@@ -1 +1 @@
-1.2.21
+1.2.22

data/lib/workhorse/daemon/shell_handler.rb

@@ -19,22 +19,22 @@ module Workhorse
       begin
         case ARGV.first
         when 'start'
-          exit daemon.start
+          exit! daemon.start
         when 'stop'
-          exit daemon.stop
+          exit! daemon.stop
         when 'kill'
-          exit daemon.stop(true)
+          exit! daemon.stop(true)
         when 'status'
-          exit daemon.status
+          exit! daemon.status
         when 'watch'
-          exit daemon.watch
+          exit! daemon.watch
         when 'restart'
-          exit daemon.restart
+          exit! daemon.restart
         when 'restart-logging'
-          exit daemon.restart_logging
+          exit! daemon.restart_logging
         when 'usage'
           usage
-          exit 99
+          exit! 99
         else
           usage
         end

data/lib/workhorse/performer.rb

@@ -9,7 +9,7 @@ module Workhorse
     end
 
     def perform
-      begin
+      begin # rubocop:disable Style/RedundantBegin
         fail 'Performer can only run once.' if @started
         @started = true
         perform!
@@ -21,7 +21,7 @@ module Workhorse
     private
 
     def perform!
-      begin
+      begin # rubocop:disable Style/RedundantBegin
         Thread.current[:workhorse_current_performer] = self
 
         ActiveRecord::Base.connection_pool.with_connection do

data/lib/workhorse/poller.rb

@@ -92,7 +92,7 @@ module Workhorse
 
           # Get pids without active process
           orphaned_pids = job_pids.select do |pid|
-            begin
+            begin # rubocop:disable Style/RedundantBegin
               Process.getpgid(pid)
               false
             rescue Errno::ESRCH
@@ -141,7 +141,7 @@ module Workhorse
     end
 
     def with_global_lock(name: :workhorse, timeout: 2, &_block)
-      begin
+      begin # rubocop:disable Style/RedundantBegin
         if @is_oracle
           result = Workhorse::DbJob.connection.select_all(
             "SELECT DBMS_LOCK.REQUEST(#{ORACLE_LOCK_HANDLE}, #{ORACLE_LOCK_MODE}, #{timeout}) FROM DUAL"
@@ -169,17 +169,17 @@ module Workhorse
             @max_global_lock_fails_reached = true
 
             worker.log 'Could not obtain global lock, retrying with next poll. ' \
-              'This will be the last such message for this worker until ' \
-              'the issue is resolved.', :warn
+                       'This will be the last such message for this worker until ' \
+                       'the issue is resolved.', :warn
 
             message = "Worker reached maximum number of consecutive times (#{Workhorse.max_global_lock_fails}) " \
-              "where the global lock could no be acquired within the specified timeout (#{timeout}). " \
-              'A worker that obtained this lock may have crashed without ending the database ' \
-              'connection properly. On MySQL, use "show processlist;" to see which connection(s) ' \
-              'is / are holding the lock for a long period of time and consider killing them using ' \
-              "MySQL's \"kill <Id>\" command. This message will be issued only once per worker " \
-              'and may only be re-triggered if the error happens again *after* the lock has ' \
-              'been solved in the meantime.'
+                      "where the global lock could no be acquired within the specified timeout (#{timeout}). " \
+                      'A worker that obtained this lock may have crashed without ending the database ' \
+                      'connection properly. On MySQL, use "show processlist;" to see which connection(s) ' \
+                      'is / are holding the lock for a long period of time and consider killing them using ' \
+                      "MySQL's \"kill <Id>\" command. This message will be issued only once per worker " \
+                      'and may only be re-triggered if the error happens again *after* the lock has ' \
+                      'been solved in the meantime.'
 
             worker.log message
             exception = StandardError.new(message)

data/lib/workhorse/pool.rb

@@ -34,7 +34,7 @@ module Workhorse
         active_threads.increment
 
         @executor.post do
-          begin
+          begin # rubocop:disable Style/RedundantBegin
             yield
           ensure
             active_threads.decrement

data/lib/workhorse/worker.rb

@@ -142,13 +142,13 @@ module Workhorse
     end
 
     def perform(db_job_id)
-      begin
+      begin # rubocop:disable Style/RedundantBegin
         mutex.synchronize do
           assert_state! :running
           log "Posting job #{db_job_id} to thread pool"
 
           @pool.post do
-            begin
+            begin # rubocop:disable Style/RedundantBegin
               Workhorse::Performer.new(db_job_id, self).perform
             rescue Exception => e
               log %(#{e.message}\n#{e.backtrace.join("\n")}), :error

data/workhorse.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: workhorse 1.2.21 ruby lib
+# stub: workhorse 1.2.22 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "workhorse".freeze
-  s.version = "1.2.21"
+  s.version = "1.2.22"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Sitrox".freeze]
-  s.date = "2024-07-02"
+  s.date = "2024-08-20"
   s.files = [".github/workflows/ruby.yml".freeze, ".gitignore".freeze, ".releaser_config".freeze, ".rubocop.yml".freeze, "CHANGELOG.md".freeze, "FAQ.md".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "RUBY_VERSION".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/rubocop".freeze, "lib/active_job/queue_adapters/workhorse_adapter.rb".freeze, "lib/generators/workhorse/install_generator.rb".freeze, "lib/generators/workhorse/templates/bin/workhorse.rb".freeze, "lib/generators/workhorse/templates/config/initializers/workhorse.rb".freeze, "lib/generators/workhorse/templates/create_table_jobs.rb".freeze, "lib/workhorse.rb".freeze, "lib/workhorse/active_job_extension.rb".freeze, "lib/workhorse/daemon.rb".freeze, "lib/workhorse/daemon/shell_handler.rb".freeze, "lib/workhorse/db_job.rb".freeze, "lib/workhorse/enqueuer.rb".freeze, "lib/workhorse/jobs/cleanup_succeeded_jobs.rb".freeze, "lib/workhorse/jobs/detect_stale_jobs_job.rb".freeze, "lib/workhorse/jobs/run_active_job.rb".freeze, "lib/workhorse/jobs/run_rails_op.rb".freeze, "lib/workhorse/performer.rb".freeze, "lib/workhorse/poller.rb".freeze, "lib/workhorse/pool.rb".freeze, "lib/workhorse/scoped_env.rb".freeze, "lib/workhorse/worker.rb".freeze, "test/active_job/queue_adapters/workhorse_adapter_test.rb".freeze, "test/lib/db_schema.rb".freeze, "test/lib/jobs.rb".freeze, "test/lib/test_helper.rb".freeze, "test/workhorse/daemon_test.rb".freeze, "test/workhorse/db_job_test.rb".freeze, "test/workhorse/enqueuer_test.rb".freeze, "test/workhorse/performer_test.rb".freeze, "test/workhorse/poller_test.rb".freeze, "test/workhorse/pool_test.rb".freeze, "test/workhorse/worker_test.rb".freeze, "workhorse.gemspec".freeze]
   s.rubygems_version = "3.4.6".freeze
   s.summary = "Multi-threaded job backend with database queuing for ruby.".freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workhorse
 version: !ruby/object:Gem::Version
-  version: 1.2.21
+  version: 1.2.22
 platform: ruby
 authors:
 - Sitrox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-02 00:00:00.000000000 Z
+date: 2024-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -247,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.5.4
 signing_key:
 specification_version: 4
 summary: Multi-threaded job backend with database queuing for ruby.