good_job 3.15.0 → 3.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9aa61d924db48712cf404f47b7a6f5b977f1464a29b7e97f068b21422ac8261a
-  data.tar.gz: 9701e674925f45189bb8763f31d35a11eeb8d1f02f132cd4cc7e3db1fa6221f7
+  metadata.gz: 4674d611fd466270ee2bb79b4763848bced81ed16ae227dc05e0daca00b5672e
+  data.tar.gz: 40dda31aa1e21e6b16e4f2582354d572af271ebe270b80e6cbfceec95873f5da
 SHA512:
-  metadata.gz: 8a07c81b1a23c12b26c21c8d3316bc01ee931e0313d3f51d811564fe80dacf86efd8a1d37f693be0e4d893983ce9aaeeccbb5c0e523410815fea052287b56c3b
-  data.tar.gz: 46e3e5a9fe2c7fd8e82a51494e4fac3c480f0e323db1aab57ea2291d7f7db39284f0a9da70692e5b160312894f69ec31453279f541f61cbec99bfb091012af26
+  metadata.gz: 73ae44f8b88e70d4cfd98473920af572320157432f121b437f99718ca2182fa88d98b7f3dd4a3aec0319b6f2ddd51eb5eed1fe0290f94b605a4b9b7fedf53cc6
+  data.tar.gz: 932c23ebe5722a3a8d7638db77bfeefd350c219a071b8b96982cd19ad78319c2ddd3f7b178d3ebb59b7d670caf7b265c01b254c2481d13a7a6f0521f0d172c82

data/CHANGELOG.md

@@ -1,5 +1,47 @@
 # Changelog
 
+## [v3.15.2](https://github.com/bensheldon/good_job/tree/v3.15.2) (2023-04-19)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.15.1...v3.15.2)
+
+**Closed issues:**
+
+- Cleaning up preserved jobs giving me timeout [\#933](https://github.com/bensheldon/good_job/issues/933)
+- uninitialized constant GoodJob::ActiveJobJob \(NameError\) [\#932](https://github.com/bensheldon/good_job/issues/932)
+
+**Merged pull requests:**
+
+- Use batched queries in `GoodJob::self.cleanup_preserved_jobs` [\#934](https://github.com/bensheldon/good_job/pull/934) ([bensheldon](https://github.com/bensheldon))
+- Bump nokogiri from 1.14.2 to 1.14.3 [\#926](https://github.com/bensheldon/good_job/pull/926) ([dependabot[bot]](https://github.com/apps/dependabot))
+
+## [v3.15.1](https://github.com/bensheldon/good_job/tree/v3.15.1) (2023-04-17)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.15.0...v3.15.1)
+
+**Implemented enhancements:**
+
+- Support for Batches? [\#417](https://github.com/bensheldon/good_job/issues/417)
+
+**Fixed bugs:**
+
+- Fix setting of locale via routes `mount ... defaults: { locale: :en }` [\#923](https://github.com/bensheldon/good_job/pull/923) ([bensheldon](https://github.com/bensheldon))
+- Set `successfully_enqueued?` when using `perform_all_later` [\#917](https://github.com/bensheldon/good_job/pull/917) ([bensheldon](https://github.com/bensheldon))
+
+**Closed issues:**
+
+- GoodJob has pending database migrations after v2 -\> v3  [\#920](https://github.com/bensheldon/good_job/issues/920)
+- Batch docs in README suggest `Batch#add` is a class method, but it's not [\#912](https://github.com/bensheldon/good_job/issues/912)
+- How do I clear queue during tests? [\#887](https://github.com/bensheldon/good_job/issues/887)
+- Implement batch functionality [\#691](https://github.com/bensheldon/good_job/issues/691)
+
+**Merged pull requests:**
+
+- In tests, directly use `connection.truncate_tables` instead of  `ActiveRecord::Tasks::DatabaseTasks.truncate_all` [\#918](https://github.com/bensheldon/good_job/pull/918) ([bensheldon](https://github.com/bensheldon))
+- Use `GoodJob.capsule` in CLI instead of creating a new Capsule [\#916](https://github.com/bensheldon/good_job/pull/916) ([bensheldon](https://github.com/bensheldon))
+- Fix lint: missing fr and nl translations; readme whitespace [\#914](https://github.com/bensheldon/good_job/pull/914) ([bensheldon](https://github.com/bensheldon))
+- Switches from Chrome to Chromium to support Apple M1/Arm CPUs [\#910](https://github.com/bensheldon/good_job/pull/910) ([ckdake](https://github.com/ckdake))
+- Bump erb\_lint from 0.3.1 to 0.4.0 [\#906](https://github.com/bensheldon/good_job/pull/906) ([dependabot[bot]](https://github.com/apps/dependabot))
+
 ## [v3.15.0](https://github.com/bensheldon/good_job/tree/v3.15.0) (2023-04-02)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v3.14.2...v3.15.0)

data/README.md

@@ -537,6 +537,7 @@ Batches track a set of jobs, and enqueue an optional callback job when all of th
 - Jobs can be added to an existing batch. Jobs in a batch are enqueued and performed immediately/asynchronously. The final callback job will not be enqueued until `GoodJob::Batch#enqueue` is called.
 
     ```ruby
+    batch = GoodJob::Batch.new
     batch = GoodJob::Batch.add do
       10.times { MyJob.perform_later }
     end

data/app/controllers/good_job/application_controller.rb

@@ -35,7 +35,9 @@ module GoodJob
     end
 
     def current_locale
-      if params[:locale]
+      if request.GET['locale']
+        request.GET['locale']
+      elsif params[:locale]
         params[:locale]
       elsif good_job_available_locales.exclude?(I18n.default_locale) && I18n.available_locales.include?(:en)
         :en

data/config/locales/fr.yml

@@ -78,8 +78,8 @@ fr:
           one: 1 jour
           other: "%{count} jours"
         x_minutes:
-          one:
-          other:
+          one: 1 minute
+          other: "%{count} minutes"
         x_months:
           one: 1 mois
           other: "%{count} mois"
@@ -130,8 +130,8 @@ fr:
       table:
         actions:
           apply_to_all:
-            one:
-            other:
+            one: Appliquer à tous les 1 travail.
+            other: Appliquer à tous les %{count} travaux.
           confirm_destroy_all: Voulez-vous vraiment détruire les travaux sélectionnés ?
           confirm_discard_all: Êtes-vous usure que vous souhaitez supprimer les emplois sélectionnés?
           confirm_reschedule_all: Voulez-vous vraiment reprogrammer les tâches sélectionnées ?

data/config/locales/nl.yml

@@ -130,8 +130,8 @@ nl:
       table:
         actions:
           apply_to_all:
-            one:
-            other:
+            one: Toepassen op alle 1 baan.
+            other: Toepassen op alle %{count} banen.
           confirm_destroy_all: Weet u zeker dat u de geselecteerde jobs wilt vernietigen?
           confirm_discard_all: Wilt u de geselecteerde jobs verwijderen?
           confirm_reschedule_all: Weet u zeker dat u de geselecteerde taken opnieuw wilt inplannen?

data/lib/good_job/adapter.rb

@@ -64,6 +64,7 @@ module GoodJob
         job_id_to_provider_job_id = results.each_with_object({}) { |result, hash| hash[result['active_job_id']] = result['id'] }
         active_jobs.each do |active_job|
           active_job.provider_job_id = job_id_to_provider_job_id[active_job.job_id]
+          active_job.successfully_enqueued = active_job.provider_job_id.present? if active_job.respond_to?(:successfully_enqueued=)
         end
         executions.each do |execution|
           execution.instance_variable_set(:@new_record, false) if job_id_to_provider_job_id[execution.active_job_id]

data/lib/good_job/cli.rb

@@ -92,10 +92,10 @@ module GoodJob
       set_up_application!
       GoodJob.configuration.options.merge!(options.symbolize_keys)
       configuration = GoodJob.configuration
+      capsule = GoodJob.capsule
 
       Daemon.new(pidfile: configuration.pidfile).daemonize if configuration.daemonize?
 
-      capsule = GoodJob::Capsule.new
       capsule.start
 
       if configuration.probe_port

data/lib/good_job/version.rb

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

data/lib/good_job.rb

@@ -162,22 +162,33 @@ module GoodJob
   # destroy old records and preserve space in your database.
   # @param older_than [nil,Numeric,ActiveSupport::Duration] Jobs older than this will be destroyed (default: +86400+).
   # @return [Integer] Number of job execution records and batches that were destroyed.
-  def self.cleanup_preserved_jobs(older_than: nil)
+  def self.cleanup_preserved_jobs(older_than: nil, in_batches_of: 1_000)
     older_than ||= GoodJob.configuration.cleanup_preserved_jobs_before_seconds_ago
     timestamp = Time.current - older_than
     include_discarded = GoodJob.configuration.cleanup_discarded_jobs?
 
     ActiveSupport::Notifications.instrument("cleanup_preserved_jobs.good_job", { older_than: older_than, timestamp: timestamp }) do |payload|
-      old_jobs = GoodJob::Job.where('finished_at <= ?', timestamp)
-      old_jobs = old_jobs.succeeded unless include_discarded
-      deleted_executions_count = GoodJob::Execution.where(job: old_jobs).delete_all
+      deleted_executions_count = 0
+      deleted_batches_count = 0
+
+      jobs_query = GoodJob::Job.where('finished_at <= ?', timestamp).order(finished_at: :asc).limit(in_batches_of)
+      jobs_query = jobs_query.succeeded unless include_discarded
+      loop do
+        deleted = GoodJob::Execution.where(job: jobs_query).delete_all
+        break if deleted.zero?
+
+        deleted_executions_count += deleted
+      end
 
       if GoodJob::BatchRecord.migrated?
-        old_batches = GoodJob::BatchRecord.where('finished_at <= ?', timestamp)
-        old_batches = old_batches.succeeded unless include_discarded
-        deleted_batches_count = old_batches.delete_all
-      else
-        deleted_batches_count = 0
+        batches_query = GoodJob::BatchRecord.where('finished_at <= ?', timestamp).limit(in_batches_of)
+        batches_query = batches_query.succeeded unless include_discarded
+        loop do
+          deleted = batches_query.delete_all
+          break if deleted.zero?
+
+          deleted_batches_count += deleted
+        end
       end
 
       payload[:destroyed_executions_count] = deleted_executions_count

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 3.15.0
+  version: 3.15.2
 platform: ruby
 authors:
 - Ben Sheldon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-02 00:00:00.000000000 Z
+date: 2023-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob