workhorse 1.3.0.rc4 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dca93061dd92dfbd43f1a44dcb2958181257d16079f408114af13a80197e48c6
-  data.tar.gz: 8a4c202c76b7380912288331bc8ef24a4dc8839c4455a4c455b48dddeb631588
+  metadata.gz: 8337d1efedcb53b3fd51e983fe235aa2f1e71b6cbfedad84d2becb5c292dfb1c
+  data.tar.gz: 6746a5eeb075df326794e135b0336dea076a624e20562184c687d50603c894bd
 SHA512:
-  metadata.gz: c8b5829f8d84bd7ed135bfcc467f5b9afd313acd9f36d94b90bf77e106b0cf6f627189bf89e6f0ba31aecf791875fd5217091b3b5034d109473623da5d1b4cf3
-  data.tar.gz: b50b7514b14ce6170b192835a9d61b03d84577de0466ef471bd60f5561a873930151d61aa9c1c3638dce889c0bdf6432a6ae7289f9e061ff4e8220313dc3937a
+  metadata.gz: 55769be0e335e14684c1e6bbd108b2c9da4fee5cf42b86149a481e0cae1d4a64d542ca0119adea20d83f3f9131dd45d61daa6e88df5e3bacde86231c0bc995b9
+  data.tar.gz: da590080ffa2b5f96c1800b730babf019f115b600335a85fc41d343573765e0114eea356c09238507913c2ca1e88cd5d0e3d12742facc201e5b9c5ba1c076188

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Workhorse Changelog
 
+## 1.3.1 - 2025-11-05
+
+* Adapt shell handler locking behavior depending on command:
+
+  * `usage|<empty string>|<unknown command>`: Does not lock anymore as it
+    only shows the usage information.
+
+  * `watch|kill`: Failing lock. These commands now simply abort if there is
+    already another locking command running.
+
+  * `start|stop|restart|status|restart-logging`: Waiting lock. These commands
+    will wait until other commands are finished. This is equal to the previous
+    behavior.
+
+## 1.3.0 - 2025-09-16
+
+* Stable release based on previous RC releases.
+
 ## 1.3.0.rc4 - 2025-08-27
 
 * Fix race-condition in polling mechanism which could result in workers 

data/VERSION

@@ -1 +1 @@
-1.3.0.rc4
+1.3.1

data/lib/workhorse/daemon/shell_handler.rb

@@ -6,31 +6,33 @@ module Workhorse
         exit 99
       end
 
-      if Workhorse.lock_shell_commands
-        lockfile_path = options.delete(:lockfile) || 'workhorse.lock'
-        lockfile = File.open(lockfile_path, 'a')
-        lockfile.flock(File::LOCK_EX || File::LOCK_NB)
-      else
-        lockfile = nil
-      end
-
+      lockfile_path = options.delete(:lockfile) || 'workhorse.lock'
       daemon = Workhorse::Daemon.new(**options, &block)
 
+      lockfile = nil
+
       begin
         case ARGV.first
         when 'start'
+          lockfile = acquire_lock(lockfile_path, File::LOCK_EX)
           status = daemon.start
         when 'stop'
+          lockfile = acquire_lock(lockfile_path, File::LOCK_EX)
           status = daemon.stop
         when 'kill'
+          lockfile = acquire_lock(lockfile_path, File::LOCK_EX | File::LOCK_NB)
           status = daemon.stop(true)
         when 'status'
+          lockfile = acquire_lock(lockfile_path, File::LOCK_EX)
           status = daemon.status
         when 'watch'
+          lockfile = acquire_lock(lockfile_path, File::LOCK_EX | File::LOCK_NB)
           status = daemon.watch
         when 'restart'
+          lockfile = acquire_lock(lockfile_path, File::LOCK_EX)
           status = daemon.restart
         when 'restart-logging'
+          lockfile = acquire_lock(lockfile_path, File::LOCK_EX)
           status = daemon.restart_logging
         when 'usage'
           usage
@@ -88,5 +90,18 @@ module Workhorse
          99 on all other errors.
       USAGE
     end
+
+    private
+
+    def self.acquire_lock(lockfile_path, flags)
+      if Workhorse.lock_shell_commands
+        lockfile = File.open(lockfile_path, 'a')
+        lockfile.flock(flags)
+
+        return lockfile
+      end
+
+      return nil
+    end
   end
 end

data/lib/workhorse/poller.rb

@@ -353,15 +353,22 @@ module Workhorse
       return Workhorse::DbJob.find_by_sql(select.to_sql).to_a
     end
 
-    # Returns a fresh Arel select manager containing the id of all waiting jobs,
-    # ordered with {#order}.
+    # Returns a fresh Arel select manager containing the id of all waiting jobs.
     #
     # @return [Arel::SelectManager] the select manager
-    def valid_ordered_select_id
+    def valid_select_id
       select = table.project(table[:id])
       select = select.where(table[:state].eq(:waiting))
       select = select.where(table[:perform_at].lteq(Time.now).or(table[:perform_at].eq(nil)))
-      return order(select)
+      return select
+    end
+
+    # Returns a fresh Arel select manager containing the id of all waiting jobs,
+    # ordered with {#order}.
+    #
+    # @return [Arel::SelectManager] the select manager
+    def valid_ordered_select_id
+      return order(valid_select_id)
     end
 
     # Orders the records by execution order (first to last)
@@ -393,7 +400,7 @@ module Workhorse
     #
     # @return [Array] an array of unique queue names
     def valid_queues
-      select = valid_ordered_select_id
+      select = valid_select_id
 
       # Restrict queues that are currently in progress, except for the nil
       # queue, where jobs may run in parallel

data/workhorse.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: workhorse 1.3.0.rc4 ruby lib
+# stub: workhorse 1.3.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "workhorse".freeze
-  s.version = "1.3.0.rc4"
+  s.version = "1.3.1"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1".freeze) if s.respond_to? :required_rubygems_version=
+  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 = "2025-08-27"
+  s.date = "2025-11-05"
   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,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: workhorse
 version: !ruby/object:Gem::Version
-  version: 1.3.0.rc4
+  version: 1.3.1
 platform: ruby
 authors:
 - Sitrox
 bindir: bin
 cert_chain: []
-date: 2025-08-27 00:00:00.000000000 Z
+date: 2025-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -112,9 +112,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.6.8
 specification_version: 4