good_job 3.15.11 → 3.15.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 983b4d8a2381c6564ab48334b2587ae33dee8cf1385d72456f29caf8dd99e26d
-  data.tar.gz: fd4a54679b61b925f3c0fe6eb07d490f6b92014e2b7a12ac869f77c4c32482e2
+  metadata.gz: 8ba9a6bb5f97a64b3ff00e48501cbebf617372e0983c5f87f14bfe25898625b1
+  data.tar.gz: 673df26ced6db84ea48e77c736d8969216497034d0c19ba3f32016fd0b915afd
 SHA512:
-  metadata.gz: 3d2d8be450c7f282e6b59c6a4730ab0eebb77c2f8c45eadf0fe556b6490b6b6e38cb247e205da275930f6bd2c4a5d23e844088004a13454e2286af72a001c095
-  data.tar.gz: 61764d8612c50fa00ea2c5aadf2d2d5ea365f771cb43aedc87bc7456d0d2a1381a3985a518ffeecd382bec27b838ce423268175e0b68687a6722ef77d2b38f88
+  metadata.gz: 9b39c600a8cb22842c8f2aee4b952695fad309fafb522f16f74ad9b21c20a9db4e9ff05ea13647024c1cbbb95438168cd620be89fb766605419de21e876a2ce8
+  data.tar.gz: 8469a0079df3bd25aa8f8474fa5cffe8a67ad7fa91efa70b7e2ebcba50e5132a1880c004e5e6bca2aa3dc12fe844a7cf4219c443644b86c7dde839833a12ab1f

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # 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)

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/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module GoodJob
   # GoodJob gem version.
-  VERSION = '3.15.11'
+  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.11
+  version: 3.15.12
 platform: ruby
 authors:
 - Ben Sheldon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-06 00:00:00.000000000 Z
+date: 2023-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob