good_job 3.15.10 → 3.15.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 000bb49d312d0103d77ce95d27e79316b7ee66b1056e0566cc1029272442c77a
-  data.tar.gz: f990fccc402be6ac4dca1e2c8c8f3f57c2a73b00d5c1a065afa1d9ca6645f602
+  metadata.gz: 8ba9a6bb5f97a64b3ff00e48501cbebf617372e0983c5f87f14bfe25898625b1
+  data.tar.gz: 673df26ced6db84ea48e77c736d8969216497034d0c19ba3f32016fd0b915afd
 SHA512:
-  metadata.gz: db26d83de8e6f07447d1ae866ea065a4b8beb37bd9c93d726929b8d0972ba0f862efd641128bffe35e964fcf2589459d60f57751f4b20d7ab16fc1daeb35a82e
-  data.tar.gz: aae23731a957a0418f13eadc9e2deab3f5378286cb3e40c00f2cf0341dd99d1a0a73f49873835f14c7e2032a4a1738310038752da8e270ac0864591c662811ad
+  metadata.gz: 9b39c600a8cb22842c8f2aee4b952695fad309fafb522f16f74ad9b21c20a9db4e9ff05ea13647024c1cbbb95438168cd620be89fb766605419de21e876a2ce8
+  data.tar.gz: 8469a0079df3bd25aa8f8474fa5cffe8a67ad7fa91efa70b7e2ebcba50e5132a1880c004e5e6bca2aa3dc12fe844a7cf4219c443644b86c7dde839833a12ab1f

data/CHANGELOG.md

@@ -1,5 +1,32 @@
 # Changelog
 
+## [v3.15.12](https://github.com/bensheldon/good_job/tree/v3.15.12) (2023-06-11)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.15.11...v3.15.12)
+
+**Fixed bugs:**
+
+- Do not allow GoodJob to automatically start after Rails initialization if previously shutdown [\#976](https://github.com/bensheldon/good_job/pull/976) ([bensheldon](https://github.com/bensheldon))
+
+**Merged pull requests:**
+
+- Fix Rubocop linting [\#975](https://github.com/bensheldon/good_job/pull/975) ([bensheldon](https://github.com/bensheldon))
+- Bump capybara from 3.38.0 to 3.39.1 [\#970](https://github.com/bensheldon/good_job/pull/970) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump thor from 1.2.1 to 1.2.2 [\#967](https://github.com/bensheldon/good_job/pull/967) ([dependabot[bot]](https://github.com/apps/dependabot))
+
+## [v3.15.11](https://github.com/bensheldon/good_job/tree/v3.15.11) (2023-06-06)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.15.10...v3.15.11)
+
+**Fixed bugs:**
+
+- Fix `discrete_executions` job re-enqueueing when `retry_job` is called directly [\#973](https://github.com/bensheldon/good_job/pull/973) ([bensheldon](https://github.com/bensheldon))
+
+**Closed issues:**
+
+- Unclear how discrete executions should work with reenqueued  jobs \(leads to broken job-iteration\) [\#972](https://github.com/bensheldon/good_job/issues/972)
+- `build_for_enqueue` discards `scheduled_at` values for bulk-enqueued jobs [\#966](https://github.com/bensheldon/good_job/issues/966)
+
 ## [v3.15.10](https://github.com/bensheldon/good_job/tree/v3.15.10) (2023-05-22)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v3.15.9...v3.15.10)

data/app/models/good_job/execution.rb

@@ -314,6 +314,8 @@ module GoodJob
             execution = current_execution
             execution.assign_attributes(enqueue_args(active_job, { scheduled_at: scheduled_at }))
             execution.scheduled_at ||= Time.current
+            # TODO: these values ideally shouldn't be persisted until the current_execution is finished
+            #   which will require handling `retry_job` being called from outside the execution context.
             execution.performed_at = nil
             execution.finished_at = nil
           else
@@ -335,7 +337,11 @@ module GoodJob
         instrument_payload[:execution] = execution
         execution.save!
 
-        CurrentThread.execution.retried_good_job_id = execution.id if retried && !CurrentThread.execution.discrete?
+        if retried
+          CurrentThread.execution_retried = true
+          CurrentThread.execution.retried_good_job_id = execution.id unless current_execution.discrete?
+        end
+
         active_job.provider_job_id = execution.id
         execution
       end
@@ -402,9 +408,9 @@ module GoodJob
             instrument_payload.merge!(
               value: value,
               handled_error: handled_error,
-              retried: current_thread.error_on_retry.present?
+              retried: current_thread.execution_retried
             )
-            ExecutionResult.new(value: value, handled_error: handled_error, retried: current_thread.error_on_retry.present?)
+            ExecutionResult.new(value: value, handled_error: handled_error, retried: current_thread.execution_retried)
           rescue StandardError => e
             instrument_payload[:unhandled_error] = e
             ExecutionResult.new(value: nil, unhandled_error: e)

data/app/models/good_job/process.rb

@@ -7,6 +7,9 @@ module GoodJob # :nodoc:
     include AssignableConnection
     include Lockable
 
+    STALE_INTERVAL = 30.seconds
+    EXPIRED_INTERVAL = 5.minutes
+
     self.table_name = 'good_job_processes'
 
     cattr_reader :mutex, default: Mutex.new
@@ -76,5 +79,21 @@ module GoodJob # :nodoc:
     def basename
       File.basename(state["proctitle"])
     end
+
+    def refresh
+      touch(:updated_at) # rubocop:disable Rails/SkipsModelValidations
+    end
+
+    def refresh_if_stale
+      refresh if stale?
+    end
+
+    def stale?
+      updated_at < STALE_INTERVAL.ago
+    end
+
+    def expired?
+      updated_at < EXPIRED_INTERVAL.ago
+    end
   end
 end

data/lib/good_job/capsule.rb

@@ -15,17 +15,18 @@ module GoodJob
       self.class.instances << self
       @configuration = configuration
 
-      @autostart = true
+      @startable = true
       @running = false
       @mutex = Mutex.new
     end
 
-    # Start executing jobs (if not already running).
-    def start
-      return if @running
+    # Start the capsule once. After a shutdown, {#restart} must be used to start again.
+    # @return [nil, Boolean] Whether the capsule was started.
+    def start(force: false)
+      return unless startable?(force: force)
 
       @mutex.synchronize do
-        return if @running
+        return unless startable?(force: force)
 
         @notifier = GoodJob::Notifier.new(enable_listening: @configuration.enable_listen_notify)
         @poller = GoodJob::Poller.new(poll_interval: @configuration.poll_interval)
@@ -35,7 +36,7 @@ module GoodJob
 
         @cron_manager = GoodJob::CronManager.new(@configuration.cron_entries, start_on_initialize: true) if @configuration.enable_cron?
 
-        @autostart = false
+        @startable = false
         @running = true
       end
     end
@@ -50,7 +51,7 @@ module GoodJob
     def shutdown(timeout: :default)
       timeout = timeout == :default ? @configuration.shutdown_timeout : timeout
       GoodJob._shutdown_all([@notifier, @poller, @scheduler, @cron_manager].compact, timeout: timeout)
-      @autostart = false
+      @startable = false
       @running = false
     end
 
@@ -61,7 +62,7 @@ module GoodJob
       raise ArgumentError, "Capsule#restart cannot be called with a timeout of nil" if timeout.nil?
 
       shutdown(timeout: timeout)
-      start
+      start(force: true)
     end
 
     # @return [Boolean] Whether the capsule is currently running.
@@ -76,10 +77,16 @@ module GoodJob
 
     # Creates an execution thread(s) with the given attributes.
     # @param job_state [Hash, nil] See {GoodJob::Scheduler#create_thread}.
-    # @return [Boolean, nil] Whether work was started.
+    # @return [Boolean, nil] Whether the thread was created.
     def create_thread(job_state = nil)
-      start if !running? && @autostart
+      start if startable?
       @scheduler&.create_thread(job_state)
     end
+
+    private
+
+    def startable?(force: false)
+      !@running && (@startable || force)
+    end
   end
 end

data/lib/good_job/current_thread.rb

@@ -13,6 +13,7 @@ module GoodJob
       error_on_retry
       execution
       execution_interrupted
+      execution_retried
     ].freeze
 
     # @!attribute [rw] cron_at
@@ -51,6 +52,12 @@ module GoodJob
     #   @return [Boolean, nil]
     thread_mattr_accessor :execution_interrupted
 
+    # @!attribute [rw] execution_retried
+    #   @!scope class
+    #   Execution Retried
+    #   @return [Boolean, nil]
+    thread_mattr_accessor :execution_retried
+
     # Resets attributes
     # @param [Hash] values to assign
     # @return [void]

data/lib/good_job/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module GoodJob
   # GoodJob gem version.
-  VERSION = '3.15.10'
+  VERSION = '3.15.12'
 
   # GoodJob version as Gem::Version object
   GEM_VERSION = Gem::Version.new(VERSION)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 3.15.10
+  version: 3.15.12
 platform: ruby
 authors:
 - Ben Sheldon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-22 00:00:00.000000000 Z
+date: 2023-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob