fleiss 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb419b5311dcda76bb9c1743b08ea56cfee270fbe6f90721347e492b2dfec292
-  data.tar.gz: 995152a6f0482b04f272ed70ab1426be7fd225eed7c30c80de638e2b56f7e119
+  metadata.gz: ee721d0d8b4ceb6a3308ded176bac0cbb64aafe602bf4aacda952d9440cff486
+  data.tar.gz: 93f4afd58038d95d24bb75640fc96b613a7eac6a421e18852ade1e25ad9df76b
 SHA512:
-  metadata.gz: 9d12678587c252a310e7fac2cc80a420076b229a3cf93458016b572b749d002b652d53ce08cf74b28e75b92f50be6c8aac948d146261a1b113db1fa844827a99
-  data.tar.gz: '0107013391774abea71a113ac3dc3849c3a08e340ff534d68468629b2e4832798763320e11251ee57ee927c5f4210ed64bf945eedbc57f08086f7415c2fd0a2c'
+  metadata.gz: '078d55bb3edf9c2419fbbd7c1906195019e50b356301cb2a4570645b5abae563975f6c0ea6d0632ce039f87c7faddb10b9a21170a0486e06011606a4c4039899'
+  data.tar.gz: cbe4badf9b18b68b9e664ed9bd9a0ec2e1021dfe5ea088ae6a404e6938e325f92fffdb1d24ee8c642b103cdf847272fa85ff2e057c120ee01ce6be8a6d78aed1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fleiss (0.4.3)
+    fleiss (0.4.4)
       activejob (>= 6.0)
       activerecord (>= 6.0)
       concurrent-ruby
@@ -9,15 +9,15 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activejob (6.1.4)
-      activesupport (= 6.1.4)
+    activejob (6.1.4.1)
+      activesupport (= 6.1.4.1)
       globalid (>= 0.3.6)
-    activemodel (6.1.4)
-      activesupport (= 6.1.4)
-    activerecord (6.1.4)
-      activemodel (= 6.1.4)
-      activesupport (= 6.1.4)
-    activesupport (6.1.4)
+    activemodel (6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activerecord (6.1.4.1)
+      activemodel (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -26,13 +26,13 @@ GEM
     ast (2.4.2)
     concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
-    globalid (0.5.1)
+    globalid (0.5.2)
       activesupport (>= 5.0)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     minitest (5.14.4)
     mysql2 (0.5.3)
-    parallel (1.20.1)
+    parallel (1.21.0)
     parser (3.0.2.0)
       ast (~> 2.4.1)
     pg (1.2.3)
@@ -53,23 +53,23 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.18.3)
+    rubocop (1.21.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 1.9.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.8.0)
+    rubocop-ast (1.11.0)
       parser (>= 3.0.1.1)
     rubocop-bsm (0.6.0)
       rubocop (~> 1.0)
       rubocop-performance
       rubocop-rake
       rubocop-rspec
-    rubocop-performance (1.11.4)
+    rubocop-performance (1.11.5)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rake (0.6.0)
@@ -81,7 +81,7 @@ GEM
     sqlite3 (1.4.2)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.0.0)
+    unicode-display_width (2.1.0)
     zeitwerk (2.4.2)
 
 PLATFORMS

data/fleiss.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'fleiss'
-  s.version       = '0.4.3'
+  s.version       = '0.4.4'
   s.authors       = ['Black Square Media Ltd']
   s.email         = ['info@blacksquaremedia.com']
   s.summary       = %(Minimialist background jobs backed by ActiveJob and ActiveRecord.)

data/lib/active_job/queue_adapters/fleiss_adapter.rb

@@ -3,11 +3,11 @@ require 'fleiss'
 module ActiveJob
   module QueueAdapters
     class FleissAdapter
-      def enqueue(job) #:nodoc:
+      def enqueue(job) # :nodoc:
         enqueue_at(job, nil)
       end
 
-      def enqueue_at(job, scheduled_at) #:nodoc:
+      def enqueue_at(job, scheduled_at) # :nodoc:
         job_id = Fleiss.backend.enqueue(job, scheduled_at: scheduled_at)
         job.provider_job_id = job_id
         job_id

data/lib/fleiss/backend/active_record/concern.rb

@@ -20,7 +20,7 @@ module Fleiss
           def wrap_perform(&block)
             connection_pool.with_connection(&block)
           rescue ::ActiveRecord::StatementInvalid
-            ::ActiveRecord::Base.clear_active_connections!
+            ::ActiveRecord::Base.clear_all_connections!
             raise
           end
 

data/lib/fleiss/worker.rb

@@ -11,8 +11,6 @@ class Fleiss::Worker
   end
 
   # Init a new worker instance
-  # @param [ConnectionPool] disque client connection pool
-  # @param [Hash] options
   # @option [Array<String>] :queues queues to watch. Default: ["default"]
   # @option [Integer] :concurrency the number of concurrent pool. Default: 10
   # @option [Numeric] :wait_time maximum time (in seconds) to wait for jobs when retrieving next batch. Default: 1s.
@@ -62,16 +60,18 @@ class Fleiss::Worker
 
     batch.each do |job|
       @pool.post do
-        Fleiss.backend.wrap_perform { perform(job) }
+        thread_id = Thread.current.object_id.to_s(16).reverse
+        Fleiss.backend.wrap_perform { perform(job, thread_id) }
+      rescue StandardError => e
+        log_exception e, "processing job ##{job.id} (by thread #{thread_id})"
       end
     end
   rescue StandardError => e
-    handle_exception e, 'running cycle'
+    log_exception e, 'running cycle'
   end
 
-  def perform(job)
-    thread_id = Thread.current.object_id.to_s(16).reverse
-    owner     = "#{uuid}/#{thread_id}"
+  def perform(job, thread_id)
+    owner = "#{uuid}/#{thread_id}"
     return unless job.start(owner)
 
     log(:info) { "Worker #{uuid} execute job ##{job.id} (by thread #{thread_id})" }
@@ -85,11 +85,9 @@ class Fleiss::Worker
     ensure
       finished ? job.finish(owner) : job.reschedule(owner)
     end
-  rescue StandardError => e
-    handle_exception e, "processing job ##{job.id} (by thread #{thread_id})"
   end
 
-  def handle_exception(err, intro)
+  def log_exception(err, intro)
     log(:error) do
       [
         "Worker #{uuid} error on #{intro}:",

data/spec/fleiss/backend/active_record_spec.rb

@@ -125,7 +125,7 @@ RSpec.describe Fleiss::Backend::ActiveRecord do
   end
 
   it 'reconnects' do
-    expect(::ActiveRecord::Base).to receive(:clear_active_connections!).once.and_return(nil)
+    expect(::ActiveRecord::Base).to receive(:clear_all_connections!).once.and_return(nil)
 
     expect do
       described_class.wrap_perform { raise ::ActiveRecord::StatementInvalid }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fleiss
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Black Square Media Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-29 00:00:00.000000000 Z
+date: 2021-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob