good_job 2.15.2 → 2.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb6d6387b67811dec6d23e26267a4fe356c42ddc3feb14cb046f57c61c2b5802
-  data.tar.gz: 7ce4090bfeb05c67913f0d6f99fb2517a4370b669fdbfb648a17bfdca3d92efc
+  metadata.gz: 1811646b013e9432de87917a2be838ee634902b22ecc942bae74a7fefab82487
+  data.tar.gz: 14a301ce871b2761484d1c40d71dc76a64ce40131b6c4f3ff5573c1a2201ee58
 SHA512:
-  metadata.gz: b2efda0438bff75e52ab9e390ee3bf33bdbb64b13a4937ed3e58170100b0afd0a0ead5a3b1b9d902548c4356eba1b9f21296bd94f4f84ecd7884ef2b28fa0a09
-  data.tar.gz: d66ebb51d7c83b0b8c77d1300707a5c82df9bdafd1bc91231093ce331d59ff788c9c59539e10f3996664b572dec3b1dab019d01d2855bf497e3b4efd86929616
+  metadata.gz: f719e920a42b626b022ea6e90572344a660adf9fac9978fcde0ae98abbb0433d89a32af25f51e14a7250ffa2ffb128accc95fce9121630cc178b957f114e2fdf
+  data.tar.gz: 83265d3360d14d249303179d5ef506e39709ddf9fbbc87df99b42e5b6057d1e9acc0a59712e8b82f0d79df69b868a26b0f5de9ebf0e1adac2e421f0b1288b94f

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [v2.16.0](https://github.com/bensheldon/good_job/tree/v2.16.0) (2022-06-17)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v2.15.2...v2.16.0)
+
+**Closed issues:**
+
+- Upgrading zeitwerk to 2.6.0 causes a warning related to good\_job [\#616](https://github.com/bensheldon/good_job/issues/616)
+
+**Merged pull requests:**
+
+- Allow inline executor to respect scheduled jobs; deprecate old behavior. Add `GoodJob.perform_inline` [\#615](https://github.com/bensheldon/good_job/pull/615) ([bensheldon](https://github.com/bensheldon))
+
 ## [v2.15.2](https://github.com/bensheldon/good_job/tree/v2.15.2) (2022-06-17)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v2.15.1...v2.15.2)

data/README.md

@@ -59,6 +59,7 @@ For more of the story of GoodJob, read the [introductory blog post](https://isla
     - [Execute jobs async / in-process](#execute-jobs-async--in-process)
     - [Migrate to GoodJob from a different ActiveJob backend](#migrate-to-goodjob-from-a-different-activejob-backend)
     - [Monitor and preserve worked jobs](#monitor-and-preserve-worked-jobs)
+    - [Write tests](#write-tests)
     - [PgBouncer compatibility](#pgbouncer-compatibility)
     - [CLI HTTP health check probes](#cli-http-health-check-probes)
 - [Contribute](#contribute)
@@ -276,6 +277,7 @@ Available configuration options are:
 - `cleanup_preserved_jobs_before_seconds_ago` (integer) number of seconds to preserve jobs when using the `$ good_job cleanup_preserved_jobs` CLI command or calling `GoodJob.cleanup_preserved_jobs`. Defaults to `86400` (1 day). Can also be set with  the environment variable `GOOD_JOB_CLEANUP_PRESERVED_JOBS_BEFORE_SECONDS_AGO`.  _This configuration is only used when {GoodJob.preserve_job_records} is `true`._
 - `cleanup_interval_jobs` (integer) Number of jobs a Scheduler will execute before cleaning up preserved jobs. Defaults to `nil`. Can also be set with  the environment variable `GOOD_JOB_CLEANUP_INTERVAL_JOBS`.
 - `cleanup_interval_seconds` (integer) Number of seconds a Scheduler will wait before cleaning up preserved jobs. Defaults to `nil`. Can also be set with  the environment variable `GOOD_JOB_CLEANUP_INTERVAL_SECONDS`.
+- `inline_execution_respects_schedule` (boolean) Opt-in to future behavior of inline execution respecting scheduled jobs. Defaults to `false`.
 - `logger` ([Rails Logger](https://api.rubyonrails.org/classes/ActiveSupport/Logger.html)) lets you set a custom logger for GoodJob. It should be an instance of a Rails `Logger` (Default: `Rails.logger`).
 - `preserve_job_records` (boolean) keeps job records in your database even after jobs are completed. (Default: `false`)
 - `retry_on_unhandled_error` (boolean) causes jobs to be re-queued and retried if they raise an instance of `StandardError`. Be advised this may lead to jobs being repeated infinitely ([see below for more on retries](#retries)). Instances of `Exception`, like SIGINT, will *always* be retried, regardless of this attribute’s value. (Default: `true`)
@@ -878,6 +880,23 @@ It is also necessary to destroy these preserved jobs from the database after a c
     bundle exec good_job cleanup_preserved_jobs --before-seconds-ago=86400
     ```
 
+### Write tests
+
+By default, GoodJob uses its inline adapter in the test environment; the inline adapter is designed for the test environment. When enquing a job with GoodJob's inline adapter, the job will be executed immediately on the current thread; unhandled exceptions will be raised.
+
+In GoodJob 2.0, the inline adapter will execute future scheduled jobs immediately. In the next major release, GoodJob 3.0, the inline adapter will not execute future scheduled jobs and instead enqueue them in the database.
+
+To opt into this behavior immediately set: `config.good_job.inline_execution_respects_schedule = true`
+
+To perform jobs inline at any time, use `GoodJob.perform_inline`. For example, using time helpers within an integration test:
+
+```ruby
+MyJob.set(wait: 10.minutes).perform_later
+travel_to(15.minutes.from_now) { GoodJob.perform_inline }
+```
+
+_Note: Rails `travel`/`travel_to` time helpers do not have millisecond precision, so you must leave at least 1 second between the schedule and time traveling for the job to be executed. This [behavior may change in Rails 7.1](https://github.com/rails/rails/pull/44088)._
+
 ### PgBouncer compatibility
 
 GoodJob is not compatible with PgBouncer in _transaction_ mode, but is compatible with PgBouncer's _connection_ mode. GoodJob uses connection-based advisory locks and LISTEN/NOTIFY, both of which require full database connections.

data/lib/good_job/adapter.rb

@@ -62,19 +62,48 @@ module GoodJob
     # @param timestamp [Integer, nil] the epoch time to perform the job
     # @return [GoodJob::Execution]
     def enqueue_at(active_job, timestamp)
+      scheduled_at = timestamp ? Time.zone.at(timestamp) : nil
+
+      if execute_inline?
+        future_scheduled = (scheduled_at.nil? || scheduled_at > Time.current)
+        will_execute_inline = !future_scheduled || (future_scheduled && !@configuration.inline_execution_respects_schedule?)
+      end
+
       execution = GoodJob::Execution.enqueue(
         active_job,
-        scheduled_at: timestamp ? Time.zone.at(timestamp) : nil,
-        create_with_advisory_lock: execute_inline?
+        scheduled_at: scheduled_at,
+        create_with_advisory_lock: will_execute_inline
       )
 
-      if execute_inline?
+      if will_execute_inline
+        if future_scheduled && !@configuration.inline_execution_respects_schedule?
+          ActiveSupport::Deprecation.warn(<<~DEPRECATION)
+            In the next major release, GoodJob will not *inline* execute
+            future-scheduled jobs.
+
+            To opt into this behavior immediately set:
+            `config.good_job.inline_execution_respects_schedule = true`
+
+            To perform jobs inline at any time, use `GoodJob.perform_inline`.
+
+            For example, using time helpers within an integration test:
+
+            ```
+            MyJob.set(wait: 10.minutes).perform_later
+            travel_to(15.minutes.from_now) { GoodJob.perform_inline }
+            ```
+
+            Note: Rails `travel`/`travel_to` time helpers do not have millisecond
+            precision, so you must leave at least 1 second between the schedule
+            and time traveling for the job to be executed.
+          DEPRECATION
+        end
+
         begin
           result = execution.perform
         ensure
           execution.advisory_unlock
         end
-
         raise result.unhandled_error if result.unhandled_error
       else
         job_state = { queue_name: execution.queue_name }

data/lib/good_job/configuration.rb

@@ -119,6 +119,10 @@ module GoodJob
       end
     end
 
+    def inline_execution_respects_schedule?
+      !!rails_config[:inline_execution_respects_schedule]
+    end
+
     # The maximum number of future-scheduled jobs to store in memory.
     # Storing future-scheduled jobs in memory reduces execution latency
     # at the cost of increased memory usage. 10,000 stored jobs = ~20MB.

data/lib/good_job/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module GoodJob
   # GoodJob gem version.
-  VERSION = '2.15.2'
+  VERSION = '2.16.0'
 end

data/lib/good_job.rb

@@ -153,6 +153,20 @@ module GoodJob
     end
   end
 
+  # Perform all queued jobs in the current thread.
+  # This is primarily intended for usage in a test environment.
+  # Unhandled job errors will be raised.
+  # @param queue_string [String] Queues to execute jobs from
+  # @return [void]
+  def self.perform_inline(queue_string = "*")
+    job_performer = JobPerformer.new(queue_string)
+    loop do
+      result = job_performer.next
+      break unless result
+      raise result.unhandled_error if result.unhandled_error
+    end
+  end
+
   def self._executables
     [].concat(
       CronManager.instances,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 2.15.2
+  version: 2.16.0
 platform: ruby
 authors:
 - Ben Sheldon