workhorse 1.0.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e083c55d647214dd5c164b6cf60f41effbd3977d4e9cb4caf1b5f7f91fe5e3d
-  data.tar.gz: 1c5c25756520f509d69372aed0a89f2a6f90e988c28388c0144717b418cad2ba
+  metadata.gz: e3c7e4fe252910423baf366bed04b4dab80fc529860d95aa4f858954d9735f14
+  data.tar.gz: 4aa288f74516cc5b097c79a6a492d15433bd7e5c0d4e90e5818818714ecf37d9
 SHA512:
-  metadata.gz: 8f11391a2d5aa0953f6aace485b4e6c769a7c7395499b5050a02b4f54491cb0d1e46cd57322e4f1cffb84d3e6d3d38136439656b17d45f4486022cbf3576516c
-  data.tar.gz: 607d765c6d5d3960e7dfa67d0a2aebdd9cdb3bbf3f6538cb4512c80c4815aedc5def6c547214e4109f225224adb2161714c4ca7cbd602ab12b70ff1cd5baadbf
+  metadata.gz: 9aa54bffce19e617fc34ba1d900e30dbae109fcda66163c47e3a1bc1a1bb7b3c8ba17c15582577a5b72c24ddccaac55ca92528dd2c7f18f90c7756eedfd72153
+  data.tar.gz: 58af82fc7c8dff5375aeb31fa71084c7718998bf242736e056ae6b20787f591d4d4e26484153874b16badbffb1aa846ca73d76ea5efbd4f21a049367537704e7

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
- - 2.3.0
  - 2.5.0
+ - 2.6.0
 services:
  - mysql
 before_install:

data/CHANGELOG.md

@@ -1,8 +1,51 @@
 # Workhorse Changelog
 
+## 1.2.1 - 2021-01-27
+
+* Log job description (if given) when performing job
+
+## 1.2.0 - 2021-01-27
+
+* `Workhorse.enqueue_active_job`
+  * Change `perform_at` to a keyword arument
+  * Allow passing `:description` and `:queue`
+
+Note that when upgrading, change:
+
+```ruby
+# From
+Workhorse.enqueue_active_job MyJob, 5.minutes.from_now
+
+# To
+Workhorse.enqueue_active_job MyJob, perform_at: 5.minutes.from_now
+```
+
+## 1.1.1 - 2021-01-19
+
+* Remove deprecation warnings with Ruby 2.7
+
+## 1.1.0 - 2020-12-24
+
+* Add `description` column to `DbJob`.
+
+If you're upgrading from a previous version, add the `description` column
+to your `DbJob` table, e.g. with such a migration:
+
+```ruby
+class AddDescriptionToWorkhorseDbJobs < ActiveRecord::Migration[6.0]
+  def change
+    add_column :jobs, :description, :string, after: :perform_at, null: true
+  end
+end
+```
+
+## 1.0.1 - 2020-12-15
+
+* Fix handling of empty pid files
+
 ## 1.0.0 - 2020-09-21
 
-* Stable release, idendital to 1.0.0.beta2 but now extensively battle-tested
+* Stable release, identical to 1.0.0.beta2 but now extensively battle-tested
 
 ## 1.0.0.beta2 - 2020-08-27
 

data/README.md

@@ -81,7 +81,7 @@ GRANT execute ON DBMS_LOCK TO <schema-name>;
 
 Workhorse can handle any jobs that support the `perform` method and are
 serializable. To queue a basic job, use the static method `Workhorse.enqueue`.
-You can optionally pass a queue name and a priority.
+You can optionally pass a queue name, a priority and a description (as a string).
 
 ```ruby
 class MyJob
@@ -94,7 +94,7 @@ class MyJob
   end
 end
 
-Workhorse.enqueue MyJob.new('John'), queue: :test, priority: 2
+Workhorse.enqueue MyJob.new('John'), queue: :test, priority: 2, description: 'Basic Job'
 ```
 
 ### RailsOps operations
@@ -381,7 +381,7 @@ configuration or else using `self.queue_adapter` in a job class inheriting from
 Per default, jobs remain in the database, no matter in which state. This can
 eventually lead to a very large jobs database. You are advised to clean your
 jobs database on a regular interval. Workhorse provides the job
-`Workhose::Jobs::CleanupSucceededJobs` for this purpose that cleans up all
+`Workhorse::Jobs::CleanupSucceededJobs` for this purpose that cleans up all
 succeeded jobs. You can run this using your scheduler in a specific interval.
 
 ## Caveats
@@ -421,4 +421,4 @@ Please consult the [FAQ](FAQ.md).
 
 ## Copyright
 
-Copyright © 2020 Sitrox. See `LICENSE` for further details.
+Copyright © 2021 Sitrox. See `LICENSE` for further details.

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.2.1

data/lib/active_job/queue_adapters/workhorse_adapter.rb

@@ -14,8 +14,8 @@ module ActiveJob
         Workhorse.enqueue_active_job(job)
       end
 
-      def enqueue_at(job, timestamp) #:nodoc:
-        Workhorse.enqueue_active_job(job, timestamp)
+      def enqueue_at(job, timestamp = Time.now) #:nodoc:
+        Workhorse.enqueue_active_job(job, perform_at: timestamp)
       end
     end
   end

data/lib/generators/workhorse/templates/create_table_jobs.rb

@@ -17,6 +17,8 @@ class CreateTableJobs < ActiveRecord::Migration
       t.integer :priority, null: false
       t.datetime :perform_at, null: true
 
+      t.string :description, null: true
+
       t.timestamps null: false
     end
 

data/lib/workhorse.rb

@@ -1,7 +1,8 @@
-require 'socket'
-require 'active_support/all'
 require 'active_record'
+require 'active_support/all'
 require 'concurrent'
+require 'socket'
+require 'uri'
 
 require 'workhorse/enqueuer'
 require 'workhorse/scoped_env'

data/lib/workhorse/daemon.rb

@@ -177,7 +177,9 @@ module Workhorse
       file = pid_file_for(worker)
 
       if File.exist?(file)
-        pid = IO.read(file).to_i
+        raw_pid = IO.read(file)
+        return nil, nil if raw_pid.blank?
+        pid = Integer(raw_pid)
         return file, process?(pid) ? pid : nil
       else
         return nil, nil

data/lib/workhorse/daemon/shell_handler.rb

@@ -1,6 +1,6 @@
 module Workhorse
   class Daemon::ShellHandler
-    def self.run(options = {}, &block)
+    def self.run(**options, &block)
       unless ARGV.count == 1
         usage
         exit 99
@@ -10,7 +10,7 @@ module Workhorse
       lockfile = File.open(lockfile_path, 'a')
       lockfile.flock(File::LOCK_EX || File::LOCK_NB)
 
-      daemon = Workhorse::Daemon.new(options, &block)
+      daemon = Workhorse::Daemon.new(**options, &block)
 
       begin
         case ARGV.first

data/lib/workhorse/db_job.rb

@@ -7,7 +7,7 @@ module Workhorse
     STATE_FAILED    = :failed
 
     if respond_to?(:attr_accessible)
-      attr_accessible :queue, :priority, :perform_at, :handler
+      attr_accessible :queue, :priority, :perform_at, :handler, :description
     end
 
     self.table_name = 'jobs'

data/lib/workhorse/enqueuer.rb

@@ -1,20 +1,27 @@
 module Workhorse
   module Enqueuer
     # Enqueue any object that is serializable and has a `perform` method
-    def enqueue(job, queue: nil, priority: 0, perform_at: Time.now)
+    def enqueue(job, queue: nil, priority: 0, perform_at: Time.now, description: nil)
       return DbJob.create!(
         queue: queue,
         priority: priority,
         perform_at: perform_at,
+        description: description,
         handler: Marshal.dump(job)
       )
     end
 
     # Enqueue an ActiveJob job
-    def enqueue_active_job(job, perform_at = Time.now)
+    def enqueue_active_job(job, perform_at: Time.now, queue: nil, description: nil)
       wrapper_job = Jobs::RunActiveJob.new(job.serialize)
-      queue = job.queue_name.blank? ? nil : job.queue_name
-      db_job = enqueue(wrapper_job, queue: queue, priority: job.priority || 0, perform_at: Time.at(perform_at))
+      queue ||= job.queue_name if job.queue_name.present?
+      db_job = enqueue(
+        wrapper_job,
+        queue:       queue,
+        priority:    job.priority || 0,
+        perform_at:  Time.at(perform_at),
+        description: description
+      )
       job.provider_job_id = db_job.id
       return db_job
     end

data/lib/workhorse/jobs/detect_stale_jobs_job.rb

@@ -22,7 +22,7 @@ module Workhorse::Jobs
         rel = rel.where('locked_at < ?', @locked_to_started_threshold.seconds.ago)
         ids = rel.pluck(:id)
 
-        if ids.size > 0
+        unless ids.empty?
           messages << "Detected #{ids.size} jobs that were locked more than "\
                       "#{@locked_to_started_threshold}s ago and might be stale: #{ids.inspect}."
         end
@@ -34,7 +34,7 @@ module Workhorse::Jobs
         rel = rel.where('started_at < ?', @run_time_threshold.seconds.ago)
         ids = rel.pluck(:id)
 
-        if ids.size > 0
+        unless ids.empty?
           messages << "Detected #{ids.size} jobs that are running for longer than "\
                       "#{@run_time_threshold}s ago and might be stale: #{ids.inspect}."
         end

data/lib/workhorse/performer.rb

@@ -59,6 +59,7 @@ module Workhorse
       # Deserialize and perform job
       # ---------------------------------------------------------------
       log 'Performing', :info
+      log "Description: #{@db_job.description}", :info unless @db_job.description.blank?
 
       if Workhorse.perform_jobs_in_tx
         Workhorse.tx_callback.call do

data/lib/workhorse/poller.rb

@@ -3,8 +3,8 @@ module Workhorse
     MIN_LOCK_TIMEOUT = 0.1 # In seconds
     MAX_LOCK_TIMEOUT = 1.0 # In seconds
 
-    ORACLE_LOCK_MODE = 6           # X_MODE (exclusive)
-    ORACLE_LOCK_HANDLE = 478564848 # Randomly chosen number
+    ORACLE_LOCK_MODE   = 6           # X_MODE (exclusive)
+    ORACLE_LOCK_HANDLE = 478_564_848 # Randomly chosen number
 
     attr_reader :worker
     attr_reader :table
@@ -72,7 +72,7 @@ module Workhorse
       end
     end
 
-    def with_global_lock(name: :workhorse, timeout: 2, &block)
+    def with_global_lock(name: :workhorse, timeout: 2, &_block)
       if @is_oracle
         result = Workhorse::DbJob.connection.select_all(
           "SELECT DBMS_LOCK.REQUEST(#{ORACLE_LOCK_HANDLE}, #{ORACLE_LOCK_MODE}, #{timeout}) FROM DUAL"

data/lib/workhorse/worker.rb

@@ -13,8 +13,8 @@ module Workhorse
 
     # Instantiates and starts a new worker with the given arguments and then
     # waits for its completion (i.e. an interrupt).
-    def self.start_and_wait(*args)
-      worker = new(*args)
+    def self.start_and_wait(**args)
+      worker = new(**args)
       worker.start
       worker.wait
     end

data/test/lib/db_schema.rb

@@ -18,6 +18,8 @@ ActiveRecord::Schema.define do
     t.integer :priority, null: false
     t.datetime :perform_at, null: true
 
+    t.string :description, null: true
+
     t.timestamps null: false
   end
 

data/test/workhorse/enqueuer_test.rb

@@ -33,6 +33,15 @@ class Workhorse::EnqueuerTest < WorkhorseTest
     assert_equal 1, Workhorse::DbJob.first.priority
   end
 
+  def test_with_description
+    assert_equal 0, Workhorse::DbJob.all.count
+    Workhorse.enqueue BasicJob.new, description: 'Lorem ipsum'
+    assert_equal 1, Workhorse::DbJob.all.count
+
+    db_job = Workhorse::DbJob.first
+    assert_equal 'Lorem ipsum', db_job.description
+  end
+
   def test_op
     Workhorse.enqueue_op DummyRailsOpsOp, { queue: :q1 }, foo: :bar
 

data/test/workhorse/poller_test.rb

@@ -48,7 +48,7 @@ class Workhorse::PollerTest < WorkhorseTest
     assert_equal %w[q1 q2], w.poller.send(:valid_queues)
   end
 
-  def test_valid_queues
+  def test_valid_queues_2
     w = Workhorse::Worker.new(polling_interval: 60)
 
     assert_equal [], w.poller.send(:valid_queues)
@@ -148,6 +148,7 @@ class Workhorse::PollerTest < WorkhorseTest
     assert_equal 25,  used_workers
   end
 
+  # rubocop: disable Style/GlobalVars
   def test_connection_loss
     $thread_conn = nil
 
@@ -174,6 +175,7 @@ class Workhorse::PollerTest < WorkhorseTest
 
     assert_equal 1, Workhorse::DbJob.succeeded.count
   end
+  # rubocop: enable Style/GlobalVars
 
   private
 

data/workhorse.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: workhorse 1.0.0 ruby lib
+# stub: workhorse 1.2.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "workhorse".freeze
-  s.version = "1.0.0"
+  s.version = "1.2.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 = "2020-09-21"
+  s.date = "2021-01-27"
   s.files = [".gitignore".freeze, ".releaser_config".freeze, ".rubocop.yml".freeze, ".travis.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/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/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.0.3".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.0.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Sitrox
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-21 00:00:00.000000000 Z
+date: 2021-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -192,8 +192,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
-email: 
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -241,10 +241,10 @@ files:
 - test/workhorse/pool_test.rb
 - test/workhorse/worker_test.rb
 - workhorse.gemspec
-homepage: 
+homepage:
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -259,8 +259,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Multi-threaded job backend with database queuing for ruby.
 test_files: