workhorse 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e083c55d647214dd5c164b6cf60f41effbd3977d4e9cb4caf1b5f7f91fe5e3d
-  data.tar.gz: 1c5c25756520f509d69372aed0a89f2a6f90e988c28388c0144717b418cad2ba
+  metadata.gz: 6b381576f799a0b69cf90e0df551cae0f967b1462bb744383933ca3e82be785d
+  data.tar.gz: c298d93548baee24c30a739b8ff3ea60ce61e91fcaf4c40cead630b29bb024d9
 SHA512:
-  metadata.gz: 8f11391a2d5aa0953f6aace485b4e6c769a7c7395499b5050a02b4f54491cb0d1e46cd57322e4f1cffb84d3e6d3d38136439656b17d45f4486022cbf3576516c
-  data.tar.gz: 607d765c6d5d3960e7dfa67d0a2aebdd9cdb3bbf3f6538cb4512c80c4815aedc5def6c547214e4109f225224adb2161714c4ca7cbd602ab12b70ff1cd5baadbf
+  metadata.gz: cc45be8c2c2ee319867798427b6994d5eba4ad6623419f54c13ed500f2a722b90acc8c5dffbd5d0e92ec6a82b4de9484559eed6798e845159210eaaf00fb324a
+  data.tar.gz: 8d7926b6c830b94aad5e1e77f4951ebd68c6d0cfd4baccd4d004d63fa9aa4701673114b97371f72f05806a2616bc5fcf633e747441e860aff13fd4b90bf4d158

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,12 @@
 # Workhorse Changelog
 
+## 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/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

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/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/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/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.0.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "workhorse".freeze
-  s.version = "1.0.0"
+  s.version = "1.0.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 = "2020-12-15"
   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.0.1
 platform: ruby
 authors:
 - Sitrox
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-21 00:00:00.000000000 Z
+date: 2020-12-15 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: