good_job 1.10.1 → 1.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2621d47f3d0de0bb0411e1b6984e5e684ec2b54a218a29e3c01219995c46f53
-  data.tar.gz: 7772377aeb51daed1530d7f01fcfe92d06ba7ca992ff010846e595450a8bd6b2
+  metadata.gz: 5e0f0ca8d7f8b024f5e84b515b8603d362b6c755d54680221e517369b6877c07
+  data.tar.gz: e69518c9d71d7b08e3707c9df8c6429ca4d9823fd1adea32adc6c0bf41ad33f4
 SHA512:
-  metadata.gz: 1f6640c27c6f3d7e2b2c20952b655e70d1079fa59cf5b130c403cf613b200902c8e5b57d36647747165cec2ec944e183f0720974c8a73bfaab3c64968003ce91
-  data.tar.gz: b514789fd4df9589f012f2c2156bfaef0fd05d2106a10345e23105e6260a160816d7a8b4ba5d97eb9095ba917ecaf3d0630e9c121cb0a23a0563dbc641cd8f45
+  metadata.gz: 50d2542bfad082dfba516c08bd994dad3fcd6e8311a8380dc012988c3e2745378271adc7d41cb91897d087a6b2b100cfb69362d3a11cd55c92c2610ceabeb80c
+  data.tar.gz: 69ffc79dc9367fc8522bdcf669cede6791d4e7903847edbc99887404b29ec43361de54a960841ee6cdeaaf236cc77d8c9c60b2c61793b5256bf2455667e0c387

data/CHANGELOG.md

@@ -1,12 +1,77 @@
 # Changelog
 
+## [v1.11.3](https://github.com/bensheldon/good_job/tree/v1.11.3) (2021-07-25)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v1.11.2...v1.11.3)
+
+**Closed issues:**
+
+- ERROR:  relation "good\_jobs" does not exist at character 454 [\#308](https://github.com/bensheldon/good_job/issues/308)
+- Add Frozen String Literal to all files [\#298](https://github.com/bensheldon/good_job/issues/298)
+- Support for good\_job without Rails? [\#295](https://github.com/bensheldon/good_job/issues/295)
+
+**Merged pull requests:**
+
+- Have prettier Dashboard asset urls e.g. `bootstrap.css` instead of `bootstrap_css.css` [\#306](https://github.com/bensheldon/good_job/pull/306) ([bensheldon](https://github.com/bensheldon))
+- Create dashboard demo app on Heroku [\#305](https://github.com/bensheldon/good_job/pull/305) ([bensheldon](https://github.com/bensheldon))
+- Add Frozen String Literal to all files [\#302](https://github.com/bensheldon/good_job/pull/302) ([tedhexaflow](https://github.com/tedhexaflow))
+
+## [v1.11.2](https://github.com/bensheldon/good_job/tree/v1.11.2) (2021-07-20)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v1.11.1...v1.11.2)
+
+**Fixed bugs:**
+
+- Notifier waits to retry listening when database is unavailable [\#301](https://github.com/bensheldon/good_job/pull/301) ([bensheldon](https://github.com/bensheldon))
+
+**Closed issues:**
+
+- Handle database connection drops [\#296](https://github.com/bensheldon/good_job/issues/296)
+- Using the `async` worker results in `ActiveModel::UnknownAttributeError  unknown attribute 'create_with_advisory_lock' for GoodJob::Job`. [\#290](https://github.com/bensheldon/good_job/issues/290)
+
+**Merged pull requests:**
+
+- Rename development and test databases to be `good_job` [\#300](https://github.com/bensheldon/good_job/pull/300) ([bensheldon](https://github.com/bensheldon))
+- Move generators spec into top-level spec directory; update dependencies [\#299](https://github.com/bensheldon/good_job/pull/299) ([bensheldon](https://github.com/bensheldon))
+
+## [v1.11.1](https://github.com/bensheldon/good_job/tree/v1.11.1) (2021-07-07)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v1.11.0...v1.11.1)
+
+**Fixed bugs:**
+
+- Defer accessing ActiveRecord `primary_key` in Lockable [\#293](https://github.com/bensheldon/good_job/pull/293) ([bensheldon](https://github.com/bensheldon))
+
+**Closed issues:**
+
+- Database connection required while loading the code on 1.10.x [\#291](https://github.com/bensheldon/good_job/issues/291)
+
+## [v1.11.0](https://github.com/bensheldon/good_job/tree/v1.11.0) (2021-07-07)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v1.10.1...v1.11.0)
+
+**Implemented enhancements:**
+
+- Add concurrency extension for ActiveJob [\#281](https://github.com/bensheldon/good_job/pull/281) ([bensheldon](https://github.com/bensheldon))
+
+**Closed issues:**
+
+- Investigate GoodJob concurrency [\#289](https://github.com/bensheldon/good_job/issues/289)
+- Problem with migrating database on 1.10.0 [\#287](https://github.com/bensheldon/good_job/issues/287)
+- Support migration --database option for install task? [\#267](https://github.com/bensheldon/good_job/issues/267)
+- Add GoodJob to Ruby Toolbox [\#243](https://github.com/bensheldon/good_job/issues/243)
+- Custom advisory locks to prevent certain jobs from being worked on concurrently? [\#206](https://github.com/bensheldon/good_job/issues/206)
+
 ## [v1.10.1](https://github.com/bensheldon/good_job/tree/v1.10.1) (2021-06-30)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v1.10.0...v1.10.1)
 
-**Merged pull requests:**
+**Fixed bugs:**
 
 - Remove `FOR UPDATE SKIP LOCKED` from job locking sql statement [\#288](https://github.com/bensheldon/good_job/pull/288) ([bensheldon](https://github.com/bensheldon))
+
+**Merged pull requests:**
+
 - Update GH Test Matrix with latest JRuby 9.2.19.0 [\#283](https://github.com/bensheldon/good_job/pull/283) ([tedhexaflow](https://github.com/tedhexaflow))
 
 ## [v1.10.0](https://github.com/bensheldon/good_job/tree/v1.10.0) (2021-06-29)
@@ -15,11 +80,11 @@
 
 **Implemented enhancements:**
 
+- Use `pg_advisory_unlock_all` after each thread's job execution; fix Lockable return values; improve test stability [\#285](https://github.com/bensheldon/good_job/pull/285) ([bensheldon](https://github.com/bensheldon))
 - Add `rails g good_job:update` command to add idempotent migration files, including `active_job_id`, `concurrency_key`, `cron_key` columns [\#266](https://github.com/bensheldon/good_job/pull/266) ([bensheldon](https://github.com/bensheldon))
 
 **Fixed bugs:**
 
-- Use `pg_advisory_unlock_all` after each thread's job execution; fix Lockable return values; improve test stability [\#285](https://github.com/bensheldon/good_job/pull/285) ([bensheldon](https://github.com/bensheldon))
 - Dashboard AssetsController does not raise if verify\_authenticity\_token is not in the callback chain [\#284](https://github.com/bensheldon/good_job/pull/284) ([bensheldon](https://github.com/bensheldon))
 
 **Closed issues:**

data/README.md

@@ -38,6 +38,7 @@ For more of the story of GoodJob, read the [introductory blog post](https://isla
     - [Configuration options](#configuration-options)
     - [Global options](#global-options)
     - [Dashboard](#dashboard)
+    - [ActiveJob Concurrency](#activejob-concurrency)
     - [Updating](#updating)
 - [Go deeper](#go-deeper)
     - [Exceptions, retries, and reliability](#exceptions-retries-and-reliability)
@@ -319,6 +320,35 @@ GoodJob includes a Dashboard as a mountable `Rails::Engine`.
     end
     ```
 
+### ActiveJob Concurrency
+
+GoodJob can extend ActiveJob to provide limits on concurrently running jobs, either at time of _enqueue_ or at _perform_.
+
+**Note:** Limiting concurrency at _enqueue_ requires Rails 6.0+ because Rails 5.2 does not support `throw :abort` in ActiveJob callbacks.
+
+```ruby
+class MyJob < ApplicationJob
+  include GoodJob::ActiveJobExtensions::Concurrency
+
+  good_job_control_concurrency_with(
+    # Maximum number of jobs with the concurrency key to be concurrently enqueued
+    enqueue_limit: 2,
+
+    # Maximum number of jobs with the concurrency key to be concurrently performed
+    perform_limit: 1,
+
+    # A unique key to be globally locked against.
+    # Can be String or Lambda/Proc that is invoked in the context of the job.
+    # Note: Arguments passed to #perform_later must be accessed through `arguments` method.
+    key: -> { "Unique-#{arguments.first}" } #  MyJob.perform_later("Alice") => "Unique-Alice"
+  )
+
+  def perform(first_name)
+    # do work
+  end
+end
+```
+
 ### Updating
 
 GoodJob follows semantic versioning, though updates may be encouraged through deprecation warnings in minor versions.

data/engine/app/controllers/good_job/active_jobs_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GoodJob
   class ActiveJobsController < GoodJob::BaseController
     def show

data/engine/app/controllers/good_job/assets_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GoodJob
   class AssetsController < ActionController::Base # rubocop:disable Rails/ApplicationController
     skip_before_action :verify_authenticity_token, raise: false

data/engine/app/controllers/good_job/base_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GoodJob
   class BaseController < ActionController::Base # rubocop:disable Rails/ApplicationController
     protect_from_forgery with: :exception

data/engine/app/controllers/good_job/dashboards_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GoodJob
   class DashboardsController < GoodJob::BaseController
     class JobFilter

data/engine/app/controllers/good_job/jobs_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GoodJob
   class JobsController < GoodJob::BaseController
     def destroy

data/engine/app/helpers/good_job/application_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GoodJob
   module ApplicationHelper
   end

data/engine/app/views/layouts/good_job/base.html.erb

@@ -5,12 +5,12 @@
   <%= csrf_meta_tags %>
   <%= csp_meta_tag %>
 
-  <%= stylesheet_link_tag bootstrap_css_path(v: GoodJob::VERSION) %>
-  <%= stylesheet_link_tag chartist_css_path(v: GoodJob::VERSION) %>
-  <%= stylesheet_link_tag style_css_path(v: GoodJob::VERSION) %>
+  <%= stylesheet_link_tag bootstrap_path(format: :css, v: GoodJob::VERSION) %>
+  <%= stylesheet_link_tag chartist_path(format: :css, v: GoodJob::VERSION) %>
+  <%= stylesheet_link_tag style_path(format: :css, v: GoodJob::VERSION) %>
 
-  <%= javascript_include_tag bootstrap_js_path(v: GoodJob::VERSION) %>
-  <%= javascript_include_tag chartist_js_path(v: GoodJob::VERSION) %>
+  <%= javascript_include_tag bootstrap_path(format: :js, v: GoodJob::VERSION) %>
+  <%= javascript_include_tag chartist_path(format: :js, v: GoodJob::VERSION) %>
 </head>
 <body>
   <nav class="navbar navbar-expand-lg navbar-light bg-light">

data/engine/config/routes.rb

@@ -1,13 +1,19 @@
+# frozen_string_literal: true
 GoodJob::Engine.routes.draw do
   root to: 'dashboards#index'
   resources :active_jobs, only: %i[show]
   resources :jobs, only: %i[destroy]
 
   scope controller: :assets do
-    get :bootstrap_css
-    get :bootstrap_js
-    get :chartist_css
-    get :chartist_js
-    get :style_css
+    constraints(format: :css) do
+      get :bootstrap, action: :bootstrap_css
+      get :chartist, action: :chartist_css
+      get :style, action: :style_css
+    end
+
+    constraints(format: :js) do
+      get :bootstrap, action: :bootstrap_js
+      get :chartist, action: :chartist_js
+    end
   end
 end

data/engine/lib/good_job/engine.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GoodJob
   class Engine < ::Rails::Engine
     isolate_namespace GoodJob

data/exe/good_job

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 require 'good_job/cli'
 
 GoodJob::CLI.within_exe = true

data/lib/active_job/queue_adapters/good_job_adapter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveJob # :nodoc:
   module QueueAdapters # :nodoc:
     # See {GoodJob::Adapter} for details.

data/lib/generators/good_job/install_generator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rails/generators'
 require 'rails/generators/active_record'
 module GoodJob

data/lib/generators/good_job/templates/update/migrations/01_create_good_jobs.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CreateGoodJobs < ActiveRecord::Migration[5.2]
   def change
     enable_extension 'pgcrypto'

data/lib/generators/good_job/templates/update/migrations/02_add_active_job_id_concurrency_key_cron_key_to_good_jobs.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class AddActiveJobIdConcurrencyKeyCronKeyToGoodJobs < ActiveRecord::Migration[5.2]
   def change
     reversible do |dir|

data/lib/generators/good_job/templates/update/migrations/03_add_active_job_id_index_and_concurrency_key_index_to_good_jobs.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class AddActiveJobIdIndexAndConcurrencyKeyIndexToGoodJobs < ActiveRecord::Migration[5.2]
   disable_ddl_transaction!
 

data/lib/generators/good_job/update_generator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rails/generators'
 require 'rails/generators/active_record'
 

data/lib/good_job.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "rails"
 require "active_job"
 require "active_job/queue_adapters"

data/lib/good_job/active_job_extensions.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+module GoodJob
+  module ActiveJobExtensions
+  end
+end

data/lib/good_job/active_job_extensions/concurrency.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+module GoodJob
+  module ActiveJobExtensions
+    module Concurrency
+      extend ActiveSupport::Concern
+
+      ConcurrencyExceededError = Class.new(StandardError)
+
+      included do
+        class_attribute :good_job_concurrency_config, instance_accessor: false, default: {}
+
+        before_enqueue do |job|
+          # Always allow jobs to be retried because the current job's execution will complete momentarily
+          next if CurrentExecution.active_job_id == job.job_id
+
+          limit = job.class.good_job_concurrency_config.fetch(:enqueue_limit, Float::INFINITY)
+          next if limit.blank? || (0...Float::INFINITY).exclude?(limit)
+
+          key = job.good_job_concurrency_key
+          next if key.blank?
+
+          GoodJob::Job.new.with_advisory_lock(key: key, function: "pg_advisory_lock") do
+            # TODO: Why is `unscoped` necessary? Nested scope is bleeding into subsequent query?
+            enqueue_concurrency = GoodJob::Job.unscoped.where(concurrency_key: key).unfinished.count
+            # The job has not yet been enqueued, so check if adding it will go over the limit
+            throw :abort if enqueue_concurrency + 1 > limit
+          end
+        end
+
+        retry_on(
+          GoodJob::ActiveJobExtensions::Concurrency::ConcurrencyExceededError,
+          attempts: Float::INFINITY,
+          wait: :exponentially_longer
+        )
+
+        before_perform do |job|
+          limit = job.class.good_job_concurrency_config.fetch(:perform_limit, Float::INFINITY)
+          next if limit.blank? || (0...Float::INFINITY).exclude?(limit)
+
+          key = job.good_job_concurrency_key
+          next if key.blank?
+
+          GoodJob::Job.new.with_advisory_lock(key: key, function: "pg_advisory_lock") do
+            perform_concurrency = GoodJob::Job.unscoped.where(concurrency_key: key).advisory_locked.count
+            # The current job has already been locked and will appear in the previous query
+            raise GoodJob::ActiveJobExtensions::Concurrency::ConcurrencyExceededError if perform_concurrency > limit
+          end
+        end
+      end
+
+      class_methods do
+        def good_job_control_concurrency_with(config)
+          self.good_job_concurrency_config = config
+        end
+      end
+
+      def good_job_concurrency_key
+        key = self.class.good_job_concurrency_config[:key]
+        return if key.blank?
+
+        if key.respond_to? :call
+          instance_exec(&key)
+        else
+          key
+        end
+      end
+    end
+  end
+end

data/lib/good_job/adapter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GoodJob
   #
   # ActiveJob Adapter.

data/lib/good_job/cli.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'thor'
 
 module GoodJob

data/lib/good_job/configuration.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GoodJob
   #
   # +GoodJob::Configuration+ provides normalized configuration information to

data/lib/good_job/current_execution.rb

@@ -1,14 +1,15 @@
+# frozen_string_literal: true
 require 'active_support/core_ext/module/attribute_accessors_per_thread'
 
 module GoodJob
   # Thread-local attributes for passing values from Instrumentation.
   # (Cannot use ActiveSupport::CurrentAttributes because ActiveJob resets it)
   module CurrentExecution
-    # @!attribute [rw] error_on_retry
+    # @!attribute [rw] active_job_id
     #   @!scope class
-    #   Error captured by retry_on
-    #   @return [Exception, nil]
-    thread_mattr_accessor :error_on_retry
+    #   ActiveJob ID
+    #   @return [String, nil]
+    thread_mattr_accessor :active_job_id
 
     # @!attribute [rw] error_on_discard
     #   @!scope class
@@ -16,11 +17,18 @@ module GoodJob
     #   @return [Exception, nil]
     thread_mattr_accessor :error_on_discard
 
+    # @!attribute [rw] error_on_retry
+    #   @!scope class
+    #   Error captured by retry_on
+    #   @return [Exception, nil]
+    thread_mattr_accessor :error_on_retry
+
     # Resets attributes
     # @return [void]
     def self.reset
-      self.error_on_retry = nil
+      self.active_job_id = nil
       self.error_on_discard = nil
+      self.error_on_retry = nil
     end
 
     # @return [Integer] Current process ID

data/lib/good_job/daemon.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GoodJob
   #
   # Manages daemonization of the current process.

data/lib/good_job/execution_result.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GoodJob
   # Stores the results of job execution
   class ExecutionResult

data/lib/good_job/job.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GoodJob
   # ActiveRecord model that represents an +ActiveJob+ job.
   # Parent class can be configured with +GoodJob.active_record_parent_class+.
@@ -10,11 +11,12 @@ module GoodJob
     PreviouslyPerformedError = Class.new(StandardError)
 
     # ActiveJob jobs without a +queue_name+ attribute are placed on this queue.
-    DEFAULT_QUEUE_NAME = 'default'.freeze
+    DEFAULT_QUEUE_NAME = 'default'
     # ActiveJob jobs without a +priority+ attribute are given this priority.
     DEFAULT_PRIORITY = 0
 
-    self.table_name = 'good_jobs'.freeze
+    self.table_name = 'good_jobs'
+    self.advisory_lockable_column = 'id'
 
     attr_readonly :serialized_params
 
@@ -219,6 +221,21 @@ module GoodJob
           DEPRECATION
         end
 
+        if column_names.include?('concurrency_key')
+          good_job_args[:concurrency_key] = active_job.good_job_concurrency_key if active_job.respond_to?(:good_job_concurrency_key)
+        else
+          ActiveSupport::Deprecation.warn(<<~DEPRECATION)
+            GoodJob has pending database migrations. To create the migration files, run:
+
+                rails generate good_job:update
+
+            To apply the migration files, run:
+
+                rails db:migrate
+
+          DEPRECATION
+        end
+
         good_job = GoodJob::Job.new(**good_job_args)
 
         instrument_payload[:good_job] = good_job
@@ -264,6 +281,10 @@ module GoodJob
       self.class.unscoped.unfinished.owns_advisory_locked.exists?(id: id)
     end
 
+    def active_job_id
+      super || serialized_params['job_id']
+    end
+
     private
 
     # @return [ExecutionResult]
@@ -273,6 +294,7 @@ module GoodJob
       )
 
       GoodJob::CurrentExecution.reset
+      GoodJob::CurrentExecution.active_job_id = active_job_id
       ActiveSupport::Notifications.instrument("perform_job.good_job", { good_job: self, process_id: GoodJob::CurrentExecution.process_id, thread_name: GoodJob::CurrentExecution.thread_name }) do
         value = ActiveJob::Base.execute(params)
 

data/lib/good_job/job_performer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'concurrent/delay'
 
 module GoodJob

data/lib/good_job/lockable.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GoodJob
   #
   # Adds Postgres advisory locking capabilities to an ActiveRecord record.
@@ -23,20 +24,20 @@ module GoodJob
 
     included do
       # Default column to be used when creating Advisory Locks
-      cattr_accessor(:advisory_lockable_column, instance_accessor: false) { primary_key }
+      class_attribute :advisory_lockable_column, instance_accessor: false, default: Concurrent::Delay.new { primary_key }
 
       # Default Postgres function to be used for Advisory Locks
-      cattr_accessor(:advisory_lockable_function) { "pg_try_advisory_lock" }
+      class_attribute :advisory_lockable_function, default: "pg_try_advisory_lock"
 
       # Attempt to acquire an advisory lock on the selected records and
       # return only those records for which a lock could be acquired.
-      # @!method advisory_lock(column: advisory_lockable_column, function: advisory_lockable_function)
+      # @!method advisory_lock(column: _advisory_lockable_column, function: advisory_lockable_function)
       # @!scope class
       # @param column [String, Symbol] column values to Advisory Lock against
       # @param function [String, Symbol]  Postgres Advisory Lock function name to use
       # @return [ActiveRecord::Relation]
       #   A relation selecting only the records that were locked.
-      scope :advisory_lock, (lambda do |column: advisory_lockable_column, function: advisory_lockable_function|
+      scope :advisory_lock, (lambda do |column: _advisory_lockable_column, function: advisory_lockable_function|
         original_query = self
 
         cte_table = Arel::Table.new(:rows)
@@ -64,13 +65,13 @@ module GoodJob
       #
       # For details on +pg_locks+, see
       # {https://www.postgresql.org/docs/current/view-pg-locks.html}.
-      # @!method joins_advisory_locks(column: advisory_lockable_column)
+      # @!method joins_advisory_locks(column: _advisory_lockable_column)
       # @!scope class
       # @param column [String, Symbol] column values to Advisory Lock against
       # @return [ActiveRecord::Relation]
       # @example Get the records that have a session awaiting a lock:
       #   MyLockableRecord.joins_advisory_locks.where("pg_locks.granted = ?", false)
-      scope :joins_advisory_locks, (lambda do |column: advisory_lockable_column|
+      scope :joins_advisory_locks, (lambda do |column: _advisory_lockable_column|
         join_sql = <<~SQL.squish
           LEFT JOIN pg_locks ON pg_locks.locktype = 'advisory'
             AND pg_locks.objsubid = 1
@@ -82,26 +83,26 @@ module GoodJob
       end)
 
       # Find records that do not have an advisory lock on them.
-      # @!method advisory_unlocked(column: advisory_lockable_column)
+      # @!method advisory_unlocked(column: _advisory_lockable_column)
       # @!scope class
       # @param column [String, Symbol] column values to Advisory Lock against
       # @return [ActiveRecord::Relation]
-      scope :advisory_unlocked, ->(column: advisory_lockable_column) { joins_advisory_locks(column: column).where(pg_locks: { locktype: nil }) }
+      scope :advisory_unlocked, ->(column: _advisory_lockable_column) { joins_advisory_locks(column: column).where(pg_locks: { locktype: nil }) }
 
       # Find records that have an advisory lock on them.
-      # @!method advisory_locked(column: advisory_lockable_column)
+      # @!method advisory_locked(column: _advisory_lockable_column)
       # @!scope class
       # @param column [String, Symbol] column values to Advisory Lock against
       # @return [ActiveRecord::Relation]
-      scope :advisory_locked, ->(column: advisory_lockable_column) { joins_advisory_locks(column: column).where.not(pg_locks: { locktype: nil }) }
+      scope :advisory_locked, ->(column: _advisory_lockable_column) { joins_advisory_locks(column: column).where.not(pg_locks: { locktype: nil }) }
 
       # Find records with advisory locks owned by the current Postgres
       # session/connection.
-      # @!method advisory_locked(column: advisory_lockable_column)
+      # @!method advisory_locked(column: _advisory_lockable_column)
       # @!scope class
       # @param column [String, Symbol] column values to Advisory Lock against
       # @return [ActiveRecord::Relation]
-      scope :owns_advisory_locked, ->(column: advisory_lockable_column) { joins_advisory_locks(column: column).where('"pg_locks"."pid" = pg_backend_pid()') }
+      scope :owns_advisory_locked, ->(column: _advisory_lockable_column) { joins_advisory_locks(column: column).where('"pg_locks"."pid" = pg_backend_pid()') }
 
       # Whether an advisory lock should be acquired in the same transaction
       # that created the record.
@@ -143,7 +144,7 @@ module GoodJob
       #   MyLockableRecord.order(created_at: :asc).limit(2).with_advisory_lock do |record|
       #     do_something_with record
       #   end
-      def with_advisory_lock(column: advisory_lockable_column, function: advisory_lockable_function, unlock_session: false)
+      def with_advisory_lock(column: _advisory_lockable_column, function: advisory_lockable_function, unlock_session: false)
         raise ArgumentError, "Must provide a block" unless block_given?
 
         records = advisory_lock(column: column, function: function).to_a
@@ -154,13 +155,19 @@ module GoodJob
             advisory_unlock_session
           else
             records.each do |record|
-              key = [table_name, record[advisory_lockable_column]].join
+              key = [table_name, record[_advisory_lockable_column]].join
               record.advisory_unlock(key: key, function: advisory_unlockable_function(function))
             end
           end
         end
       end
 
+      # Allow advisory_lockable_column to be a `Concurrent::Delay`
+      def _advisory_lockable_column
+        column = advisory_lockable_column
+        column.respond_to?(:value) ? column.value : column
+      end
+
       def supports_cte_materialization_specifiers?
         return @_supports_cte_materialization_specifiers if defined?(@_supports_cte_materialization_specifiers)
 
@@ -201,9 +208,16 @@ module GoodJob
     # @param function [String, Symbol] Postgres Advisory Lock function name to use
     # @return [Boolean] whether the lock was acquired.
     def advisory_lock(key: lockable_key, function: advisory_lockable_function)
-      query = <<~SQL.squish
-        SELECT #{function}(('x'||substr(md5($1::text), 1, 16))::bit(64)::bigint) AS locked
-      SQL
+      query = if function.include? "_try_"
+                <<~SQL.squish
+                  SELECT #{function}(('x'||substr(md5($1::text), 1, 16))::bit(64)::bigint) AS locked
+                SQL
+              else
+                <<~SQL.squish
+                  SELECT #{function}(('x'||substr(md5($1::text), 1, 16))::bit(64)::bigint)::text AS locked
+                SQL
+              end
+
       binds = [[nil, key]]
       self.class.connection.exec_query(pg_or_jdbc_query(query), 'GoodJob::Lockable Advisory Lock', binds).first['locked']
     end
@@ -301,7 +315,7 @@ module GoodJob
     # Default Advisory Lock key
     # @return [String]
     def lockable_key
-      [self.class.table_name, self[self.class.advisory_lockable_column]].join
+      [self.class.table_name, self[self.class._advisory_lockable_column]].join
     end
 
     delegate :pg_or_jdbc_query, to: :class

data/lib/good_job/log_subscriber.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GoodJob
   #
   # Listens to GoodJob notifications and logs them.

data/lib/good_job/multi_scheduler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GoodJob
   # Delegates the interface of a single {Scheduler} to multiple Schedulers.
   class MultiScheduler

data/lib/good_job/notifier.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'concurrent/atomic/atomic_boolean'
 
 module GoodJob # :nodoc:
@@ -13,7 +14,7 @@ module GoodJob # :nodoc:
     AdapterCannotListenError = Class.new(StandardError)
 
     # Default Postgres channel for LISTEN/NOTIFY
-    CHANNEL = 'good_job'.freeze
+    CHANNEL = 'good_job'
     # Defaults for instance of Concurrent::ThreadPoolExecutor
     EXECUTOR_OPTIONS = {
       name: name,
@@ -24,6 +25,8 @@ module GoodJob # :nodoc:
       max_queue: 1,
       fallback_policy: :discard,
     }.freeze
+    # Seconds to wait if database cannot be connected to
+    RECONNECT_INTERVAL = 5
     # Seconds to block while LISTENing for a message
     WAIT_INTERVAL = 1
 
@@ -114,7 +117,13 @@ module GoodJob # :nodoc:
         ActiveSupport::Notifications.instrument("notifier_notify_error.good_job", { error: thread_error })
       end
 
-      listen unless shutdown?
+      return if shutdown?
+
+      if thread_error.is_a?(ActiveRecord::ConnectionNotEstablished) || thread_error.is_a?(ActiveRecord::StatementInvalid)
+        listen(delay: RECONNECT_INTERVAL)
+      else
+        listen
+      end
     end
 
     private
@@ -125,8 +134,8 @@ module GoodJob # :nodoc:
       @executor = Concurrent::ThreadPoolExecutor.new(EXECUTOR_OPTIONS)
     end
 
-    def listen
-      future = Concurrent::Future.new(args: [@recipients, executor, @listening], executor: @executor) do |thr_recipients, thr_executor, thr_listening|
+    def listen(delay: 0)
+      future = Concurrent::ScheduledTask.new(delay, args: [@recipients, executor, @listening], executor: @executor) do |thr_recipients, thr_executor, thr_listening|
         with_listen_connection do |conn|
           ActiveSupport::Notifications.instrument("notifier_listen.good_job") do
             conn.async_exec("LISTEN #{CHANNEL}").clear

data/lib/good_job/poller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'concurrent/atomic/atomic_boolean'
 
 module GoodJob # :nodoc:

data/lib/good_job/railtie.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GoodJob
   # Ruby on Rails integration.
   class Railtie < ::Rails::Railtie

data/lib/good_job/scheduler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "concurrent/executor/thread_pool_executor"
 require "concurrent/executor/timer_set"
 require "concurrent/scheduled_task"

data/lib/good_job/version.rb

@@ -1,4 +1,5 @@
+# frozen_string_literal: true
 module GoodJob
   # GoodJob gem version.
-  VERSION = '1.10.1'.freeze
+  VERSION = '1.11.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.11.3
 platform: ruby
 authors:
 - Ben Sheldon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-30 00:00:00.000000000 Z
+date: 2021-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -362,6 +362,8 @@ files:
 - lib/generators/good_job/templates/update/migrations/03_add_active_job_id_index_and_concurrency_key_index_to_good_jobs.rb
 - lib/generators/good_job/update_generator.rb
 - lib/good_job.rb
+- lib/good_job/active_job_extensions.rb
+- lib/good_job/active_job_extensions/concurrency.rb
 - lib/good_job/adapter.rb
 - lib/good_job/cli.rb
 - lib/good_job/configuration.rb