workhorse 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd78ce0b033690529240d1111c8545ab78dfd753fbe7fee551313b2a7d33fc26
-  data.tar.gz: 9e7e22992ed727f60882f448f0003318cd40142402590cf199812d461db58378
+  metadata.gz: df386a01e22eb4d5e05be449ef11a62341d28c3443fdef76b07ac7e8bca3e3d4
+  data.tar.gz: 0a4f325c0bf2cb08357a195a2297d0302df275abf3cd6d83329942d68419f7c8
 SHA512:
-  metadata.gz: e5d6560a8a6ef01c555222568eb0af6ad44c09484cfeee05093c3ad966e19ebe80f0d6754b85dccab869bb98ef279aede2dbc39da5f7a38b2b1d3eef054136f4
-  data.tar.gz: 2422ef7003b9dc3e3e3409a794afc57a4ae33226366292dadc89e4afe823289e2aa27c45f5c7b0586262344115d8ca1839b7e84d15980c5a69099c26f3c3c599
+  metadata.gz: 12b8ec75c276bf6d888e3f60b523a32cc387c6c4a935b20004fce4f63acbc4e7046979315eb7c6651953177d7289a3bf27fabc535da117a3d6a9c7be36f17ccd
+  data.tar.gz: 1d15f6cf25a9fe2878e9edf45a7b2ce69d0bf0904119efd2d6234e8c15dc7142ce81c427912f22f2459fa27967b58932497424646d5ea9af431d625a1e154a8a

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Workhorse Changelog
 
+## 1.4.1 - 2026-02-18
+
+* Close inherited lockfile fd in forked worker processes. Previously the
+  lockfile's file descriptor was inherited by children via `fork`, which could
+  prevent the POSIX `flock` from being released if the daemon process exited
+  abnormally.
+
+* Fix `watch` and `kill` commands to actually abort when the lock is
+  unavailable. Previously the `flock` return value with `LOCK_NB` was not
+  checked, so the commands would silently proceed without the lock.
+
+* Add error handling to the `HUP` signal handler for log reopening. Exceptions
+  from `logger.reopen` are now caught and reported via `on_exception`.
+
+  Sitrox reference: #120574.
+
 ## 1.4.0 - 2026-02-12
 
 * Stable release based on previous RC release.

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.4.1

data/lib/workhorse/daemon/shell_handler.rb

@@ -1,5 +1,7 @@
 module Workhorse
   class Daemon::ShellHandler
+    class LockNotAvailableError < StandardError; end
+
     def self.run(**options, &block)
       unless ARGV.one?
         usage
@@ -15,27 +17,43 @@ module Workhorse
         case ARGV.first
         when 'start'
           lockfile = acquire_lock(lockfile_path, File::LOCK_EX)
+          daemon.lockfile = lockfile
           status = daemon.start
         when 'stop'
           lockfile = acquire_lock(lockfile_path, File::LOCK_EX)
+          daemon.lockfile = lockfile
           status = daemon.stop
         when 'kill'
-          lockfile = acquire_lock(lockfile_path, File::LOCK_EX | File::LOCK_NB)
-          status = daemon.stop(true)
+          begin
+            lockfile = acquire_lock(lockfile_path, File::LOCK_EX | File::LOCK_NB)
+            daemon.lockfile = lockfile
+            status = daemon.stop(true)
+          rescue LockNotAvailableError
+            status = 1
+          end
         when 'status'
           lockfile = acquire_lock(lockfile_path, File::LOCK_EX)
+          daemon.lockfile = lockfile
           status = daemon.status
         when 'watch'
-          lockfile = acquire_lock(lockfile_path, File::LOCK_EX | File::LOCK_NB)
-          status = daemon.watch
+          begin
+            lockfile = acquire_lock(lockfile_path, File::LOCK_EX | File::LOCK_NB)
+            daemon.lockfile = lockfile
+            status = daemon.watch
+          rescue LockNotAvailableError
+            status = 1
+          end
         when 'restart'
           lockfile = acquire_lock(lockfile_path, File::LOCK_EX)
+          daemon.lockfile = lockfile
           status = daemon.restart
         when 'restart-logging'
           lockfile = acquire_lock(lockfile_path, File::LOCK_EX)
+          daemon.lockfile = lockfile
           status = daemon.restart_logging
         when 'soft-restart'
           lockfile = acquire_lock(lockfile_path, File::LOCK_EX)
+          daemon.lockfile = lockfile
           status = daemon.soft_restart
         when 'usage'
           usage
@@ -105,7 +123,12 @@ module Workhorse
     def self.acquire_lock(lockfile_path, flags)
       if Workhorse.lock_shell_commands
         lockfile = File.open(lockfile_path, 'a')
-        lockfile.flock(flags)
+        result = lockfile.flock(flags)
+
+        if result == false
+          lockfile.close
+          fail LockNotAvailableError, 'Could not acquire lock. Is another workhorse command already running?'
+        end
 
         return lockfile
       end

data/lib/workhorse/daemon.rb

@@ -34,6 +34,10 @@ module Workhorse
     # @private
     attr_reader :workers
 
+    # @return [File, nil] Lockfile handle to close in forked children
+    # @private
+    attr_accessor :lockfile
+
     # Creates a new daemon instance.
     #
     # @param pidfile [String, nil] Path template for PID files (use %i placeholder for worker ID)
@@ -261,6 +265,8 @@ module Workhorse
 
       pid = fork do
         $0 = process_name(worker)
+        # Close inherited lockfile fd to prevent holding the flock after parent exits
+        @lockfile&.close
         # Reopen pipes to prevent #107576
         $stdin.reopen File.open(File::NULL, 'r')
         null_out = File.open File::NULL, 'w'

data/lib/workhorse/worker.rb

@@ -296,11 +296,14 @@ module Workhorse
     def trap_log_reopen
       Signal.trap(LOG_REOPEN_SIGNAL) do
         Thread.new do
-          logger.reopen
+          logger&.reopen
 
           if defined?(ActiveRecord::Base) && ActiveRecord::Base.logger && ActiveRecord::Base.logger != logger
             ActiveRecord::Base.logger.reopen
           end
+        rescue Exception => e
+          log %(Log reopen signal handler error: #{e.message}\n#{e.backtrace.join("\n")}), :error
+          Workhorse.on_exception.call(e)
         end.join
       end
     end

data/workhorse.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: workhorse 1.4.0 ruby lib
+# stub: workhorse 1.4.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "workhorse".freeze
-  s.version = "1.4.0"
+  s.version = "1.4.1"
 
   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 = "2026-02-12"
+  s.date = "2026-02-18"
   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.homepage = "https://github.com/sitrox/workhorse".freeze
   s.licenses = ["MIT".freeze]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: workhorse
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Sitrox
 bindir: bin
 cert_chain: []
-date: 2026-02-12 00:00:00.000000000 Z
+date: 2026-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport