workhorse 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c1be39da6073815c572723439313acb43f8dfb84
-  data.tar.gz: 76093dbfede4a6ff6df3cf65437fa3898371918d
+SHA256:
+  metadata.gz: e6cda82b0f03df2130e38841bff942ab7f3d559a1c6233121c6060a7c06d50d0
+  data.tar.gz: 64b0c6ba8e659ff3dcc4009b5c13ba91139e7f82a6043f42c0d3eed6c0368107
 SHA512:
-  metadata.gz: 75f5b82d38db45cf9589722faede509202b3273ca025e0d7aacc41120fe0ed171915fc035fcc3111463b08cd1b19b066ffed1209f1a45cbc7fdcfa9d811931bb
-  data.tar.gz: f9cfb313c78592a9a05ad6b72eec42500869d653ab048175c3d892dbb58c47584f06500504ab43a76dd4edcc01133c6b2876e007a376db64256a194fb41dc1d9
+  metadata.gz: '0998ffd89b16233c8fa97fa00b8db4de490f9dccdebc7a6002a5d44a0ac859a050a41e339c545f6ec5ebfaa9888671b693cf389a779975c214b54cd9328385d4'
+  data.tar.gz: 9b2d2d1fc6e3d2667286c9a5f48a247596612a9b0162b4cc202b536f43745a55894d35f45e2efd5badf431cbaea0a47f9108262d1d24252bf4410222d7eb58e5

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Workhorse Change log
 
-## 0.3.3 - 2018-02-23
+## 0.3.4 - 2018-09-24
+
+* *Fixes #14
+
+* Fixes crucial bug where multiple jobs of the same queue could be executed
+  simultaneously.
+
+* Makes `Workhorse::DbJob` attributes accessible for earlier versions of rails.
+
+## 0.3.3 - 2018-02-26
 
 * Adds missing require for `concurrent` library that is required in some
   versions of Rails

data/FAQ.md

@@ -75,3 +75,7 @@ production mode.
 ## Why does workhorse not support timeouts?
 
 Generic timeout implementations are [a dangerous thing](http://www.mikeperham.com/2015/05/08/timeout-rubys-most-dangerous-api/) in Ruby. This is why we decided against providing this feature in Workhorse and recommend to implement the timeouts inside of your jobs - i.e. via network timeouts.
+
+## Why is workhorse not integrated into Rails per default?
+
+We have submitted [a pull request](https://github.com/rails/rails/pull/31504) to Rails, but they stated that they won't add any new adapters to Rails. There are plans to integrate this on the Gem side only - stay tuned.

data/Rakefile

@@ -15,7 +15,7 @@ task :gemspec do
     spec.add_development_dependency 'rake'
     spec.add_development_dependency 'rubocop', '0.51.0'
     spec.add_development_dependency 'minitest'
-    spec.add_development_dependency 'mysql2', '~> 0.3.13'
+    spec.add_development_dependency 'mysql2'
     spec.add_development_dependency 'benchmark-ips'
     spec.add_dependency 'activesupport'
     spec.add_dependency 'activerecord'

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/lib/workhorse/daemon.rb

@@ -8,6 +8,8 @@ module Workhorse
 
       fail 'Count must be an integer > 0.' unless count.is_a?(Integer) && count > 0
 
+      FileUtils.mkdir_p('tmp/pids')
+
       if @pidfile.nil?
         @pidfile = count > 1 ? 'tmp/pids/workhorse.%i.pid' : 'tmp/pids/workhorse.pid'
       elsif @count > 1 && !@pidfile.include?('%s')

data/lib/workhorse/db_job.rb

@@ -6,6 +6,10 @@ module Workhorse
     STATE_SUCCEEDED = :succeeded
     STATE_FAILED    = :failed
 
+    if respond_to?(:attr_accessible)
+      attr_accessible :queue, :priority, :perform_at, :handler
+    end
+
     self.table_name = 'jobs'
 
     def mark_locked!(worker_id)

data/lib/workhorse/poller.rb

@@ -88,7 +88,7 @@ module Workhorse
       # ---------------------------------------------------------------
       # Select jobs to execute
       # ---------------------------------------------------------------
-      #
+
       # Construct selects for each queue which then are UNIONed for the final
       # set. This is required because we only want the first job of each queue
       # to be posted.
@@ -188,8 +188,9 @@ module Workhorse
       select = valid_ordered_select
 
       # Restrict queues that are currently in progress
+      bad_states = [Workhorse::DbJob::STATE_LOCKED, Workhorse::DbJob::STATE_STARTED]
       bad_queries_select = table.project(table[:queue])
-                                .where(table[:state].in(%i[locked running]))
+                                .where(table[:state].in(bad_states))
       # .distinct is not chainable in older Arel versions
       bad_queries_select.distinct
       select = select.where(table[:queue].not_in(bad_queries_select))

data/lib/workhorse/worker.rb

@@ -9,6 +9,7 @@ module Workhorse
     attr_reader :polling_interval
     attr_reader :mutex
     attr_reader :logger
+    attr_reader :poller
 
     # Instantiates and starts a new worker with the given arguments and then
     # waits for its completion (i.e. an interrupt).

data/test/workhorse/poller_test.rb

@@ -10,4 +10,41 @@ class Workhorse::PollerTest < WorkhorseTest
       w.shutdown
     end
   end
+
+  def test_valid_queues
+    w = Workhorse::Worker.new(polling_interval: 60)
+
+    Workhorse.enqueue BasicJob.new(sleep_time: 2), queue: :q1
+    Workhorse.enqueue BasicJob.new(sleep_time: 2), queue: :q1
+    Workhorse.enqueue BasicJob.new(sleep_time: 2), queue: :q2
+    Workhorse.enqueue BasicJob.new(sleep_time: 2), queue: :q2
+
+    assert_equal %w[q1 q2], w.poller.send(:valid_queues)
+
+    first_job = Workhorse::DbJob.first
+    first_job.mark_locked!(42)
+
+    assert_equal %w[q2], w.poller.send(:valid_queues)
+
+    first_job.mark_started!
+
+    assert_equal %w[q2], w.poller.send(:valid_queues)
+
+    first_job.mark_succeeded!
+
+    assert_equal %w[q1 q2], w.poller.send(:valid_queues)
+
+    last_job = Workhorse::DbJob.last
+    last_job.mark_locked!(42)
+
+    assert_equal %w[q1], w.poller.send(:valid_queues)
+
+    begin
+      fail 'Some exception'
+    rescue => e
+      last_job.mark_failed!(e)
+    end
+
+    assert_equal %w[q1 q2], w.poller.send(:valid_queues)
+  end
 end

data/test/workhorse/worker_test.rb

@@ -109,6 +109,17 @@ class Workhorse::WorkerTest < WorkhorseTest
     assert_equal 'succeeded', jobs[2].state
   end
 
+  def test_queue_not_parallel
+    Workhorse::DbJob.delete_all
+    Workhorse.enqueue BasicJob.new(sleep_time: 0.2), queue: :q1
+    Workhorse.enqueue BasicJob.new(sleep_time: 0.2), queue: :q1
+
+    work 0.2, polling_interval: 0.2
+    jobs = Workhorse::DbJob.all.to_a
+    assert_equal 'succeeded', jobs[0].state
+    assert_equal 'waiting',   jobs[1].state
+  end
+
   def test_multiple_queued_same_queue
     # One queue
     Workhorse.enqueue BasicJob.new(sleep_time: 0.2), queue: :q1

data/workhorse.gemspec

@@ -1,16 +1,16 @@
 # -*- encoding: utf-8 -*-
-# stub: workhorse 0.3.3 ruby lib
+# stub: workhorse 0.3.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "workhorse".freeze
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   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 = "2018-02-26"
+  s.date = "2018-09-24"
   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/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/run_rails_op.rb".freeze, "lib/workhorse/performer.rb".freeze, "lib/workhorse/poller.rb".freeze, "lib/workhorse/pool.rb".freeze, "lib/workhorse/worker.rb".freeze, "test/lib/db_schema.rb".freeze, "test/lib/jobs.rb".freeze, "test/lib/test_helper.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 = "2.6.14".freeze
+  s.rubygems_version = "2.5.2.3".freeze
   s.summary = "Multi-threaded job backend with database queuing for ruby.".freeze
   s.test_files = ["test/lib/db_schema.rb".freeze, "test/lib/jobs.rb".freeze, "test/lib/test_helper.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]
 
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rake>.freeze, [">= 0"])
       s.add_development_dependency(%q<rubocop>.freeze, ["= 0.51.0"])
       s.add_development_dependency(%q<minitest>.freeze, [">= 0"])
-      s.add_development_dependency(%q<mysql2>.freeze, ["~> 0.3.13"])
+      s.add_development_dependency(%q<mysql2>.freeze, [">= 0"])
       s.add_development_dependency(%q<benchmark-ips>.freeze, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>.freeze, [">= 0"])
       s.add_runtime_dependency(%q<activerecord>.freeze, [">= 0"])
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rake>.freeze, [">= 0"])
       s.add_dependency(%q<rubocop>.freeze, ["= 0.51.0"])
       s.add_dependency(%q<minitest>.freeze, [">= 0"])
-      s.add_dependency(%q<mysql2>.freeze, ["~> 0.3.13"])
+      s.add_dependency(%q<mysql2>.freeze, [">= 0"])
       s.add_dependency(%q<benchmark-ips>.freeze, [">= 0"])
       s.add_dependency(%q<activesupport>.freeze, [">= 0"])
       s.add_dependency(%q<activerecord>.freeze, [">= 0"])
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rake>.freeze, [">= 0"])
     s.add_dependency(%q<rubocop>.freeze, ["= 0.51.0"])
     s.add_dependency(%q<minitest>.freeze, [">= 0"])
-    s.add_dependency(%q<mysql2>.freeze, ["~> 0.3.13"])
+    s.add_dependency(%q<mysql2>.freeze, [">= 0"])
     s.add_dependency(%q<benchmark-ips>.freeze, [">= 0"])
     s.add_dependency(%q<activesupport>.freeze, [">= 0"])
     s.add_dependency(%q<activerecord>.freeze, [">= 0"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workhorse
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Sitrox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-26 00:00:00.000000000 Z
+date: 2018-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,16 +70,16 @@ dependencies:
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.13
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.13
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
@@ -212,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Multi-threaded job backend with database queuing for ruby.