good_job 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08edeaef5cda608f5e5afd0ee0c8813805e4e88791a338dc66ab9129a9f727f6'
-  data.tar.gz: 3608a46f95035a843ea422cca420f344d870a8be558fe9f2cdb6c765c5cbd153
+  metadata.gz: b5125c48d26036d60649d0448f064aebcbe95fd90ac5e2eeb22e504761f7cdd1
+  data.tar.gz: f6cd3d0bcbfbbc639d0724557c7dbad61e9aef717545916b57a11c4413dcfe3f
 SHA512:
-  metadata.gz: 57f471ffef16a4f1def70922e8601b3612de84441233523492a543b7276dbb00c5dd8e37a8fd7c58d930ac78c3ea0f65704a4bef4175ef588fbf65d11051eca7
-  data.tar.gz: e0d76a4990f613b81431e42c89f5ff1172b5353a9025d6684d866048771cbd845d51a12a212fe1df85934d7854f298a333d426b8738b0fbfd2fbbad27880f02a
+  metadata.gz: eeb551e271b3a47aa903d64e566a010c87a632fd064835928d4986342405f458e02c5f88451c034ee2c73225274d54583ed963431e08e80232bcd3d87f76d500
+  data.tar.gz: f0c70c47ad3279bb41440ed27408511bdebc064524cf0933db066a0420bae829b1145b7713bc644febe0bc21e3010334f1c641863674110df878dd4245d17b7a

data/CHANGELOG.md

@@ -1,12 +1,42 @@
 # Changelog
 
+## [v1.2.2](https://github.com/bensheldon/good_job/tree/v1.2.2) (2020-08-26)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v1.2.1...v1.2.2)
+
+**Implemented enhancements:**
+
+- Run Github Action tests against Ruby 2.5, 2.6, 2.7 [\#100](https://github.com/bensheldon/good_job/issues/100)
+
+**Fixed bugs:**
+
+- Freezes puma on code change [\#95](https://github.com/bensheldon/good_job/issues/95)
+- Ruby 2.7 keyword arguments warning [\#93](https://github.com/bensheldon/good_job/issues/93)
+
+**Closed issues:**
+
+- Add test for `rails g good\_job:install` [\#57](https://github.com/bensheldon/good_job/issues/57)
+
+**Merged pull requests:**
+
+- Use more ActiveRecord in Lockable and not connection.execute [\#102](https://github.com/bensheldon/good_job/pull/102) ([bensheldon](https://github.com/bensheldon))
+- Run CI tests on Ruby 2.5, 2.6, and 2.7 [\#101](https://github.com/bensheldon/good_job/pull/101) ([arku](https://github.com/arku))
+- Return to using executor.wrap around Scheduler execution task [\#99](https://github.com/bensheldon/good_job/pull/99) ([bensheldon](https://github.com/bensheldon))
+- Fix Ruby 2.7 keyword arguments warning [\#98](https://github.com/bensheldon/good_job/pull/98) ([arku](https://github.com/arku))
+- Remove executor/reloader for less interlocking [\#97](https://github.com/bensheldon/good_job/pull/97) ([sj26](https://github.com/sj26))
+- Name the thread pools [\#96](https://github.com/bensheldon/good_job/pull/96) ([sj26](https://github.com/sj26))
+- Add test for `rails g good\_job:install` [\#94](https://github.com/bensheldon/good_job/pull/94) ([arku](https://github.com/arku))
+
 ## [v1.2.1](https://github.com/bensheldon/good_job/tree/v1.2.1) (2020-08-21)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v1.2.0...v1.2.1)
 
-**Closed issues:**
+**Fixed bugs:**
 
 - undefined method `thread\_mattr\_accessor' when not requiring the Sprockets Railstie [\#85](https://github.com/bensheldon/good_job/issues/85)
+
+**Closed issues:**
+
 - Document comparison of GoodJob with other backends [\#51](https://github.com/bensheldon/good_job/issues/51)
 
 **Merged pull requests:**
@@ -47,7 +77,6 @@
 
 **Merged pull requests:**
 
-- Capture errors via instrumentation from retry\_on and discard\_on [\#79](https://github.com/bensheldon/good_job/pull/79) ([bensheldon](https://github.com/bensheldon))
 - Document GoodJob::Scheduler with Yard [\#78](https://github.com/bensheldon/good_job/pull/78) ([bensheldon](https://github.com/bensheldon))
 
 ## [v1.1.2](https://github.com/bensheldon/good_job/tree/v1.1.2) (2020-08-13)
@@ -72,6 +101,7 @@
 
 **Merged pull requests:**
 
+- Capture errors via instrumentation from retry\_on and discard\_on [\#79](https://github.com/bensheldon/good_job/pull/79) ([bensheldon](https://github.com/bensheldon))
 - Allow instantiation of multiple schedulers via --queues [\#76](https://github.com/bensheldon/good_job/pull/76) ([bensheldon](https://github.com/bensheldon))
 - Extract options parsing to Configuration object [\#74](https://github.com/bensheldon/good_job/pull/74) ([bensheldon](https://github.com/bensheldon))
 

data/lib/good_job/adapter.rb

@@ -9,10 +9,12 @@ module GoodJob
       end
 
       configuration = GoodJob::Configuration.new(
-        execution_mode: execution_mode,
-        queues: queues,
-        max_threads: max_threads,
-        poll_interval: poll_interval
+        {
+          execution_mode: execution_mode,
+          queues: queues,
+          max_threads: max_threads,
+          poll_interval: poll_interval,
+        }
       )
 
       @execution_mode = configuration.execution_mode

data/lib/good_job/job.rb

@@ -58,7 +58,8 @@ module GoodJob
 
       unfinished.priority_ordered.only_scheduled.limit(1).with_advisory_lock do |good_jobs|
         good_job = good_jobs.first
-        break unless good_job
+        # TODO: Determine why some records are fetched without an advisory lock at all
+        break unless good_job&.owns_advisory_lock?
 
         result, error = good_job.perform
       end

data/lib/good_job/lockable.rb

@@ -55,19 +55,17 @@ module GoodJob
     end
 
     def advisory_lock
-      query = <<~SQL
-        SELECT 1 AS one
-        WHERE pg_try_advisory_lock(('x'||substr(md5(:table_name || :id::text), 1, 16))::bit(64)::bigint)
+      where_sql = <<~SQL
+        pg_try_advisory_lock(('x'||substr(md5(:table_name || :id::text), 1, 16))::bit(64)::bigint)
       SQL
-      self.class.connection.execute(sanitize_sql_for_conditions([query, { table_name: self.class.table_name, id: send(self.class.primary_key) }])).ntuples.positive?
+      self.class.unscoped.where(where_sql, { table_name: self.class.table_name, id: send(self.class.primary_key) }).exists?
     end
 
     def advisory_unlock
-      query = <<~SQL
-        SELECT 1 AS one
-        WHERE pg_advisory_unlock(('x'||substr(md5(:table_name || :id::text), 1, 16))::bit(64)::bigint)
+      where_sql = <<~SQL
+        pg_advisory_unlock(('x'||substr(md5(:table_name || :id::text), 1, 16))::bit(64)::bigint)
       SQL
-      self.class.connection.execute(sanitize_sql_for_conditions([query, { table_name: self.class.table_name, id: send(self.class.primary_key) }])).ntuples.positive?
+      self.class.unscoped.where(where_sql, { table_name: self.class.table_name, id: send(self.class.primary_key) }).exists?
     end
 
     def advisory_lock!
@@ -85,11 +83,11 @@ module GoodJob
     end
 
     def advisory_locked?
-      self.class.advisory_locked.where(id: send(self.class.primary_key)).any?
+      self.class.unscoped.advisory_locked.where(id: send(self.class.primary_key)).exists?
     end
 
     def owns_advisory_lock?
-      self.class.owns_advisory_locked.where(id: send(self.class.primary_key)).any?
+      self.class.unscoped.owns_advisory_locked.where(id: send(self.class.primary_key)).exists?
     end
 
     def advisory_unlock!

data/lib/good_job/notifier.rb

@@ -7,6 +7,7 @@ module GoodJob # :nodoc:
   class Notifier
     CHANNEL = 'good_job'.freeze
     POOL_OPTIONS = {
+      name: name,
       min_threads: 0,
       max_threads: 1,
       auto_terminate: true,
@@ -69,13 +70,12 @@ module GoodJob # :nodoc:
 
     def listen
       future = Concurrent::Future.new(args: [@recipients, @pool, @listening], executor: @pool) do |recipients, pool, listening|
-        Rails.application.reloader.wrap do
-          conn = ActiveRecord::Base.connection.raw_connection
-          ActiveSupport::Notifications.instrument("notifier_listen.good_job") do
-            conn.async_exec "LISTEN #{CHANNEL}"
-          end
+        begin
+          with_listen_connection do |conn|
+            ActiveSupport::Notifications.instrument("notifier_listen.good_job") do
+              conn.async_exec "LISTEN #{CHANNEL}"
+            end
 
-          begin
             ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
               while pool.running?
                 listening.make_true
@@ -93,14 +93,14 @@ module GoodJob # :nodoc:
                 listening.make_false
               end
             end
-          rescue StandardError => e
-            ActiveSupport::Notifications.instrument("notifier_notify_error.good_job", { error: e })
-            raise
-          ensure
-            @listening.make_false
-            ActiveSupport::Notifications.instrument("notifier_unlisten.good_job") do
-              conn.async_exec "UNLISTEN *"
-            end
+          end
+        rescue StandardError => e
+          ActiveSupport::Notifications.instrument("notifier_notify_error.good_job", { error: e })
+          raise
+        ensure
+          @listening.make_false
+          ActiveSupport::Notifications.instrument("notifier_unlisten.good_job") do
+            conn.async_exec "UNLISTEN *"
           end
         end
       end
@@ -112,5 +112,16 @@ module GoodJob # :nodoc:
     def listen_observer(_time, _result, _thread_error)
       listen unless shutdown?
     end
+
+    def with_listen_connection
+      ar_conn = ActiveRecord::Base.connection_pool.checkout.tap do |conn|
+        ActiveRecord::Base.connection_pool.remove(conn)
+      end
+      pg_conn = ar_conn.raw_connection
+      pg_conn.exec("SET application_name = #{pg_conn.escape_identifier(self.class.name)}")
+      yield pg_conn
+    ensure
+      ar_conn.disconnect!
+    end
   end
 end

data/lib/good_job/scheduler.rb

@@ -21,6 +21,7 @@ module GoodJob # :nodoc:
 
     # Defaults for instance of Concurrent::ThreadPoolExecutor
     DEFAULT_POOL_OPTIONS = {
+      name: name,
       min_threads: 0,
       max_threads: Concurrent.processor_count,
       auto_terminate: true,

data/lib/good_job/version.rb

@@ -1,3 +1,3 @@
 module GoodJob
-  VERSION = '1.2.1'.freeze
+  VERSION = '1.2.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Ben Sheldon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-21 00:00:00.000000000 Z
+date: 2020-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby