good_job 3.18.2 → 3.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8210d74d5adf0f1c6f9a7d080fe855c9bbb4042d8c4e1c8349da9b26452ec629
-  data.tar.gz: 04c5daddea00fbb9a8eb6b068af973541790c7fec49bbd678a03e8e2eafc853b
+  metadata.gz: 6c66d226179c2cd55bfc539c943df468fc683f761b89cdc10606f03a6bb26f87
+  data.tar.gz: f72404539fb5bf7ef122cf65ed616276dd0457538b1319e253d6078e223ddbbb
 SHA512:
-  metadata.gz: 9f2d6b3da26ea4fe01bff9e4a2ffa0830b34da0299af27e880a277703716fde024ca166bfa2203cf18cf53171523be9bca0754b21bba942e734506336a1020a5
-  data.tar.gz: 789e7565b789970c679beffef4a8f8c482469e1d027f97274bae0bf40709d94da08ded1e408011773a107880cd704402db6c6e964a363258b8d26ede29598def
+  metadata.gz: 98d03d3abdbcc20956e37e8c498c8fa57c1b2b091c5f50c0654aa75875d9d23ca02aeb78d67f5f2a8c961a9aabfc0ad3899fcf1867c2b4350dfe56584568a4eb
+  data.tar.gz: f0044b4c761371391c5aec83500efece2e000a6f9741a504f244208ae403b42fd39e1324fe1e753e3ae4d67c6ae92706f9a960ab5ec2745df547acd4e0927ac7

data/CHANGELOG.md

@@ -1,5 +1,44 @@
 # Changelog
 
+## [v3.19.0](https://github.com/bensheldon/good_job/tree/v3.19.0) (2023-09-19)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.18.3...v3.19.0)
+
+**Implemented enhancements:**
+
+- "Force" discard jobs that are already running/runaway to prevent retry [\#1073](https://github.com/bensheldon/good_job/pull/1073) ([jgrau](https://github.com/jgrau))
+
+**Closed issues:**
+
+- Possible Memory Leak [\#1074](https://github.com/bensheldon/good_job/issues/1074)
+- What's the best way to stop and discard a running job? [\#625](https://github.com/bensheldon/good_job/issues/625)
+
+**Merged pull requests:**
+
+- AdvisoryLockable: Abort record create if with\_advisory\_lock fails to acquire advisory lock [\#1078](https://github.com/bensheldon/good_job/pull/1078) ([bensheldon](https://github.com/bensheldon))
+- Wrap all test background threads in Rails executors; better test logging/debugging [\#1077](https://github.com/bensheldon/good_job/pull/1077) ([bensheldon](https://github.com/bensheldon))
+
+## [v3.18.3](https://github.com/bensheldon/good_job/tree/v3.18.3) (2023-09-16)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.18.2...v3.18.3)
+
+**Fixed bugs:**
+
+- Allow Probe Server's `/connect` to handle a certain number of reconnects before statusing [\#1075](https://github.com/bensheldon/good_job/pull/1075) ([bensheldon](https://github.com/bensheldon))
+
+**Closed issues:**
+
+-  ActiveRecord::RecordNotUnique good\_jobs.id error in rspec test suite [\#1072](https://github.com/bensheldon/good_job/issues/1072)
+- Probe failures on heavy usage of dashboard\(?\) [\#1068](https://github.com/bensheldon/good_job/issues/1068)
+
+**Merged pull requests:**
+
+- Bump actions/checkout from 3 to 4 [\#1070](https://github.com/bensheldon/good_job/pull/1070) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Add Skylight for demo site; create distinct development, lint, demo, production Gemfile groups; a little bit of Rubocop [\#1069](https://github.com/bensheldon/good_job/pull/1069) ([bensheldon](https://github.com/bensheldon))
+- Add JRuby 9.4 to testing matrix; nerf ActiveJob::TestQueueAdapter overrides [\#1067](https://github.com/bensheldon/good_job/pull/1067) ([bensheldon](https://github.com/bensheldon))
+- Reorganize dependencies to make booting JRuby easier [\#1066](https://github.com/bensheldon/good_job/pull/1066) ([bensheldon](https://github.com/bensheldon))
+- Slight refactoring to CronEntry [\#1063](https://github.com/bensheldon/good_job/pull/1063) ([bensheldon](https://github.com/bensheldon))
+
 ## [v3.18.2](https://github.com/bensheldon/good_job/tree/v3.18.2) (2023-09-02)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v3.18.1...v3.18.2)

data/app/controllers/good_job/jobs_controller.rb

@@ -3,6 +3,7 @@
 module GoodJob
   class JobsController < GoodJob::ApplicationController
     DISCARD_MESSAGE = "Discarded through dashboard"
+    FORCE_DISCARD_MESSAGE = "Force discarded through dashboard"
 
     ACTIONS = {
       discard: "discarded",
@@ -66,6 +67,12 @@ module GoodJob
       redirect_back(fallback_location: jobs_path, notice: t(".notice"))
     end
 
+    def force_discard
+      @job = Job.find(params[:id])
+      @job.force_discard_job(FORCE_DISCARD_MESSAGE)
+      redirect_back(fallback_location: jobs_path, notice: t(".notice"))
+    end
+
     def reschedule
       @job = Job.find(params[:id])
       @job.reschedule_job

data/app/filters/good_job/batches_filter.rb

@@ -16,7 +16,7 @@ module GoodJob
     end
 
     def default_base_query
-      GoodJob::BatchRecord.all.includes(:jobs)
+      GoodJob::BatchRecord.includes(:jobs)
     end
   end
 end

data/app/models/concerns/good_job/advisory_lockable.rb

@@ -133,7 +133,12 @@ module GoodJob
       # @return [Boolean]
       attr_accessor :create_with_advisory_lock
 
-      after_create -> { advisory_lock }, if: :create_with_advisory_lock
+      after_create lambda {
+        advisory_lock || begin
+          errors.add(self.class.advisory_lockable_column, "Failed to acquire advisory lock: #{lockable_key}")
+          raise ActiveRecord::RecordInvalid # do not reference the record because it can cause I18n missing translation error
+        end
+      }, if: :create_with_advisory_lock
     end
 
     class_methods do
@@ -222,6 +227,47 @@ module GoodJob
         connection.exec_query(pg_or_jdbc_query(query), 'GoodJob::Lockable Advisory Unlock', binds).first['unlocked']
       end
 
+      # Tests whether the provided key has an advisory lock on it.
+      # @param key [String, Symbol] Key to test lock against
+      # @return [Boolean]
+      def advisory_locked_key?(key)
+        query = <<~SQL.squish
+          SELECT 1 AS one
+          FROM pg_locks
+          WHERE pg_locks.locktype = 'advisory'
+            AND pg_locks.objsubid = 1
+            AND pg_locks.classid = ('x' || substr(md5($1::text), 1, 16))::bit(32)::int
+            AND pg_locks.objid = (('x' || substr(md5($2::text), 1, 16))::bit(64) << 32)::bit(32)::int
+          LIMIT 1
+        SQL
+        binds = [
+          ActiveRecord::Relation::QueryAttribute.new('key', key, ActiveRecord::Type::String.new),
+          ActiveRecord::Relation::QueryAttribute.new('key', key, ActiveRecord::Type::String.new),
+        ]
+        connection.exec_query(pg_or_jdbc_query(query), 'GoodJob::Lockable Advisory Locked?', binds).any?
+      end
+
+      # Tests whether this record is locked by the current database session.
+      # @param key [String, Symbol] Key to test lock against
+      # @return [Boolean]
+      def owns_advisory_lock_key?(key)
+        query = <<~SQL.squish
+          SELECT 1 AS one
+          FROM pg_locks
+          WHERE pg_locks.locktype = 'advisory'
+            AND pg_locks.objsubid = 1
+            AND pg_locks.classid = ('x' || substr(md5($1::text), 1, 16))::bit(32)::int
+            AND pg_locks.objid = (('x' || substr(md5($2::text), 1, 16))::bit(64) << 32)::bit(32)::int
+            AND pg_locks.pid = pg_backend_pid()
+          LIMIT 1
+        SQL
+        binds = [
+          ActiveRecord::Relation::QueryAttribute.new('key', key, ActiveRecord::Type::String.new),
+          ActiveRecord::Relation::QueryAttribute.new('key', key, ActiveRecord::Type::String.new),
+        ]
+        connection.exec_query(pg_or_jdbc_query(query), 'GoodJob::Lockable Owns Advisory Lock?', binds).any?
+      end
+
       def _advisory_lockable_column
         advisory_lockable_column || primary_key
       end
@@ -318,20 +364,7 @@ module GoodJob
     # @param key [String, Symbol] Key to test lock against
     # @return [Boolean]
     def advisory_locked?(key: lockable_key)
-      query = <<~SQL.squish
-        SELECT 1 AS one
-        FROM pg_locks
-        WHERE pg_locks.locktype = 'advisory'
-          AND pg_locks.objsubid = 1
-          AND pg_locks.classid = ('x' || substr(md5($1::text), 1, 16))::bit(32)::int
-          AND pg_locks.objid = (('x' || substr(md5($2::text), 1, 16))::bit(64) << 32)::bit(32)::int
-        LIMIT 1
-      SQL
-      binds = [
-        ActiveRecord::Relation::QueryAttribute.new('key', key, ActiveRecord::Type::String.new),
-        ActiveRecord::Relation::QueryAttribute.new('key', key, ActiveRecord::Type::String.new),
-      ]
-      self.class.connection.exec_query(pg_or_jdbc_query(query), 'GoodJob::Lockable Advisory Locked?', binds).any?
+      self.class.advisory_locked_key?(key)
     end
 
     # Tests whether this record does not have an advisory lock on it.
@@ -345,6 +378,7 @@ module GoodJob
     # @param key [String, Symbol] Key to test lock against
     # @return [Boolean]
     def owns_advisory_lock?(key: lockable_key)
+      self.class.owns_advisory_lock_key?(key)
       query = <<~SQL.squish
         SELECT 1 AS one
         FROM pg_locks

data/app/models/good_job/base_record.rb

@@ -30,10 +30,10 @@ module GoodJob
 
     # Runs the block with self.logger silenced.
     # If self.logger is nil, simply runs the block.
-    def self.with_logger_silenced(&block)
+    def self.with_logger_silenced(silent: true, &block)
       # Assign to a local variable, just in case it's modified in another thread concurrently
       logger = self.logger
-      if logger.respond_to? :silence
+      if silent && logger.respond_to?(:silence)
         logger.silence(&block)
       else
         yield

data/app/models/good_job/cron_entry.rb

@@ -60,29 +60,15 @@ module GoodJob # :nodoc:
 
     def next_at(previously_at: nil)
       if cron_proc?
-        result = Rails.application.executor.wrap { cron.call(previously_at || last_at) }
-        return Fugit.parse(result).next_time.to_t if result.is_a?(String)
-
-        return result
-
+        result = Rails.application.executor.wrap { cron.call(previously_at || last_job_at) }
+        if result.is_a?(String)
+          Fugit.parse(result).next_time.to_t
+        else
+          result
+        end
+      else
+        fugit.next_time.to_t
       end
-      fugit.next_time.to_t
-    end
-
-    def schedule
-      return "Custom schedule" if cron_proc?
-
-      fugit.original
-    end
-
-    def jobs
-      GoodJob::Job.where(cron_key: key)
-    end
-
-    def last_at
-      return if last_job.blank?
-
-      (last_job.cron_at || last_job.created_at).localtime
     end
 
     def enabled?
@@ -113,15 +99,11 @@ module GoodJob # :nodoc:
       false
     end
 
-    def last_job
-      jobs.order("cron_at DESC NULLS LAST").first
-    end
-
     def display_properties
       {
         key: key,
         class: job_class,
-        cron: schedule,
+        cron: display_schedule,
         set: display_property(set),
         description: display_property(description),
       }.tap do |properties|
@@ -130,6 +112,24 @@ module GoodJob # :nodoc:
       end
     end
 
+    def display_schedule
+      cron_proc? ? display_property(cron) : fugit.original
+    end
+
+    def jobs
+      GoodJob::Job.where(cron_key: key)
+    end
+
+    def last_job
+      jobs.order("cron_at DESC NULLS LAST").first
+    end
+
+    def last_job_at
+      return if last_job.blank?
+
+      (last_job.cron_at || last_job.created_at).localtime
+    end
+
     private
 
     def cron
@@ -163,7 +163,7 @@ module GoodJob # :nodoc:
       case value
       when NilClass
         "None"
-      when Proc
+      when Callable
         "Lambda/Callable"
       else
         value

data/app/models/good_job/job.rb

@@ -215,32 +215,17 @@ module GoodJob
     # @return [void]
     def discard_job(message)
       with_advisory_lock do
-        execution = head_execution(reload: true)
-        active_job = execution.active_job(ignore_deserialization_errors: true)
-
-        raise ActionForStateMismatchError if execution.finished_at.present?
-
-        job_error = GoodJob::Job::DiscardJobError.new(message)
-
-        update_execution = proc do
-          execution.update(
-            {
-              finished_at: Time.current,
-              error: GoodJob::Execution.format_error(job_error),
-            }.tap do |attrs|
-              attrs[:error_event] = ERROR_EVENT_DISCARDED if self.class.error_event_migrated?
-            end
-          )
-        end
-
-        if active_job.respond_to?(:instrument)
-          active_job.send :instrument, :discard, error: job_error, &update_execution
-        else
-          update_execution.call
-        end
+        _discard_job(message)
       end
     end
 
+    # Force discard a job so that it will not be executed further. Force discard allows discarding
+    # a running job.
+    # This action will add a {DiscardJobError} to the job's {Execution} and mark it as finished.
+    def force_discard_job(message)
+      _discard_job(message)
+    end
+
     # Reschedule a scheduled job so that it executes immediately (or later) by the next available execution thread.
     # @param scheduled_at [DateTime, Time] When to reschedule the job
     # @return [void]
@@ -277,5 +262,33 @@ module GoodJob
     def _head?
       _execution_id == head_execution(reload: true).id
     end
+
+    private
+
+    def _discard_job(message)
+      execution = head_execution(reload: true)
+      active_job = execution.active_job(ignore_deserialization_errors: true)
+
+      raise ActionForStateMismatchError if execution.finished_at.present?
+
+      job_error = GoodJob::Job::DiscardJobError.new(message)
+
+      update_execution = proc do
+        execution.update(
+          {
+            finished_at: Time.current,
+            error: GoodJob::Execution.format_error(job_error),
+          }.tap do |attrs|
+            attrs[:error_event] = ERROR_EVENT_DISCARDED if self.class.error_event_migrated?
+          end
+        )
+      end
+
+      if active_job.respond_to?(:instrument)
+        active_job.send :instrument, :discard, error: job_error, &update_execution
+      else
+        update_execution.call
+      end
+    end
   end
 end

data/app/views/good_job/cron_entries/index.html.erb

@@ -31,7 +31,7 @@
           <div class="col-12 col-lg-2 text-wrap"><%= tag.span tag.code(cron_entry.job_class), class: "fs-5 mb-0" %></div>
           <div class="col-6 col-lg-2 text-wrap">
             <div class="d-lg-none small text-muted mt-1"><%= t "good_job.models.cron.schedule" %></div>
-            <span class="font-monospace fw-bold"><%= cron_entry.schedule %></span>
+            <span class="font-monospace fw-bold"><%= cron_entry.display_schedule %></span>
           </div>
           <div class="col-6 col-lg-2 text-wrap small">
             <div class="d-lg-none small text-muted mt-1"><%= t "good_job.models.cron.next_scheduled" %></div>
@@ -40,7 +40,7 @@
           <div class="col-6 col-lg-2 text-wrap small">
             <% if cron_entry.last_job.present? %>
               <div class="d-lg-none small text-muted mt-1"><%= t "good_job.models.cron.last_run" %></div>
-              <%= link_to relative_time(cron_entry.last_at), cron_entry_path(cron_entry), title: "Job #{cron_entry.last_job.id}" %>
+              <%= link_to relative_time(cron_entry.last_job_at), cron_entry_path(cron_entry), title: "Job #{cron_entry.last_job.id}" %>
             <% end %>
           </div>
           <div class="col d-flex gap-3 justify-content-end">

data/app/views/good_job/jobs/_table.erb

@@ -127,6 +127,13 @@
                         <%=t "good_job.actions.discard" %>
                       <% end %>
                     </li>
+                    <li>
+                      <% job_force_discardable = job.status.in? [:running] %>
+                      <%= link_to force_discard_job_path(job.id), method: :put, class: "dropdown-item #{'disabled' unless job_force_discardable}", title: t("good_job.jobs.actions.force_discard"), data: { confirm: t("good_job.jobs.actions.confirm_force_discard"), disable: true } do %>
+                        <%= render "good_job/shared/icons/eject" %>
+                        <%=t "good_job.actions.force_discard" %>
+                      <% end %>
+                    </li>
                     <li>
                       <%= link_to retry_job_path(job.id), method: :put, class: "dropdown-item #{'disabled' unless job.status == :discarded}", title: t("good_job.jobs.actions.retry"), data: { confirm: t("good_job.jobs.actions.confirm_retry"), disable: true } do %>
                         <%= render "good_job/shared/icons/arrow_clockwise" %>

data/app/views/good_job/shared/icons/_eject.html.erb

@@ -0,0 +1,4 @@
+<!-- https://icons.getbootstrap.com/icons/eject/ -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-eject" viewBox="0 0 16 16">
+  <path d="M7.27 1.047a1 1 0 0 1 1.46 0l6.345 6.77c.6.638.146 1.683-.73 1.683H1.656C.78 9.5.326 8.455.926 7.816L7.27 1.047zM14.346 8.5 8 1.731 1.654 8.5h12.692zM.5 11.5a1 1 0 0 1 1-1h13a1 1 0 0 1 1 1v1a1 1 0 0 1-1 1h-13a1 1 0 0 1-1-1v-1zm14 0h-13v1h13v-1z" />
+</svg>

data/config/locales/de.yml

@@ -4,6 +4,7 @@ de:
     actions:
       destroy: Zerstören
       discard: Verwerfen
+      force_discard: Verwerfen erzwingen
       inspect: Prüfen
       reschedule: Umplanen
       retry: Wiederholen
@@ -110,10 +111,14 @@ de:
       actions:
         confirm_destroy: Sind Sie sicher, dass Sie den Job zerstören wollen?
         confirm_discard: Sind Sie sicher, dass Sie den Job verwerfen wollen?
+        confirm_force_discard: 'Sind Sie sicher, dass Sie das Verwerfen dieses Jobs erzwingen möchten? Der Job wird als verworfen markiert, aber der laufende Job wird nicht gestoppt – er wird jedoch bei Fehlern nicht erneut versucht.
+
+          '
         confirm_reschedule: Möchten Sie den Auftrag wirklich verschieben?
         confirm_retry: Möchten Sie den Job wirklich wiederholen?
         destroy: Arbeit vernichten
         discard: Auftrag verwerfen
+        force_discard: Job verwerfen erzwingen
         reschedule: Auftrag neu planen
         retry: Job wiederholen
       destroy:
@@ -124,6 +129,8 @@ de:
         in_queue: in der Warteschlange
         runtime: Laufzeit
         title: Hinrichtungen
+      force_discard:
+        notice: Der Job wurde zwangsweise verworfen. Die Ausführung wird fortgesetzt, bei Fehlern wird der Vorgang jedoch nicht wiederholt
       index:
         job_pagination: Job-Paginierung
         older_jobs: Ältere Berufe

data/config/locales/en.yml

@@ -4,6 +4,7 @@ en:
     actions:
       destroy: Destroy
       discard: Discard
+      force_discard: Force discard
       inspect: Inspect
       reschedule: Reschedule
       retry: Retry
@@ -110,10 +111,14 @@ en:
       actions:
         confirm_destroy: Are you sure you want to destroy the job?
         confirm_discard: Are you usure you want to discard the job?
+        confirm_force_discard: 'Are you sure you want to force discard this job? The job will be marked as discarded but the running job will not be stopped - it will, however, not be retried on failures.
+
+          '
         confirm_reschedule: Are you sure you want to reschedule the job?
         confirm_retry: Are you sure you want to retry the job?
         destroy: Destroy job
         discard: Discard job
+        force_discard: Force discard job
         reschedule: Reschedule job
         retry: Retry job
       destroy:
@@ -124,6 +129,8 @@ en:
         in_queue: in queue
         runtime: runtime
         title: Executions
+      force_discard:
+        notice: Job has been force discarded. It will continue to run but it will not be retried on failures
       index:
         job_pagination: Job pagination
         older_jobs: Older jobs

data/config/locales/es.yml

@@ -4,6 +4,7 @@ es:
     actions:
       destroy: Eliminar
       discard: Descartar
+      force_discard: Forzar descarte
       inspect: Inspeccionar
       reschedule: Reprogramar
       retry: Reintentar
@@ -110,10 +111,12 @@ es:
       actions:
         confirm_destroy: "¿Estás seguro que querés eliminar esta tarea?"
         confirm_discard: "¿Estás seguro que querés descartar esta tarea?"
+        confirm_force_discard: "¿Está seguro de que desea forzar el descarte de este trabajo? El trabajo se marcará como descartado, pero el trabajo en ejecución no se detendrá; sin embargo, no se volverá a intentar en caso de falla.\n"
         confirm_reschedule: "¿Estás seguro que querés reprogramar esta tarea?"
         confirm_retry: "¿Estás seguro que querés reintentar esta tarea?"
         destroy: Eliminar tarea
         discard: Descartar tarea
+        force_discard: Forzar el descarte del trabajo
         reschedule: Reprogramar tarea
         retry: Reiuntentar tarea
       destroy:
@@ -124,6 +127,8 @@ es:
         in_queue: en cola
         runtime: en ejecución
         title: Ejecuciones
+      force_discard:
+        notice: Job ha sido descartado a la fuerza. Continuará ejecutándose pero no se volverá a intentar en caso de fallas.
       index:
         job_pagination: Paginación de tareas
         older_jobs: Tareas anteriores

data/config/locales/fr.yml

@@ -4,6 +4,7 @@ fr:
     actions:
       destroy: Détruire
       discard: Mettre au rebut
+      force_discard: Forcer le rejet
       inspect: Inspecter
       reschedule: Reprogrammer
       retry: Recommencez
@@ -110,10 +111,14 @@ fr:
       actions:
         confirm_destroy: Voulez-vous vraiment détruire le job ?
         confirm_discard: Voulez-vous vraiment mettre au rebut le job ?
+        confirm_force_discard: 'Êtes-vous sûr de vouloir forcer l''abandon de cette tâche ? Le travail sera marqué comme abandonné mais le travail en cours d''exécution ne sera pas arrêté - il ne sera cependant pas réessayé en cas d''échec.
+
+          '
         confirm_reschedule: Voulez-vous vraiment replanifier le job ?
         confirm_retry: Voulez-vous vraiment réessayer le job ?
         destroy: Détruire le job
         discard: Mettre au rebut le job
+        force_discard: Forcer l'abandon du travail
         reschedule: Replanifier le job
         retry: Réessayer le job
       destroy:
@@ -124,6 +129,8 @@ fr:
         in_queue: Dans la file d'attente
         runtime: Durée
         title: Exécutions
+      force_discard:
+        notice: Le travail a été abandonné de force. Il continuera à fonctionner mais il ne sera pas réessayé en cas d'échec
       index:
         job_pagination: Pagination du job
         older_jobs: Jobs plus anciens

data/config/locales/ja.yml

@@ -4,6 +4,7 @@ ja:
     actions:
       destroy: 削除する
       discard: 破棄する
+      force_discard: 強制破棄
       inspect: 調査する
       reschedule: 再スケジュールする
       retry: 再試行する
@@ -110,10 +111,14 @@ ja:
       actions:
         confirm_destroy: ジョブを削除してもよろしいですか？
         confirm_discard: ジョブを破棄してもよろしいですか？
+        confirm_force_discard: 'このジョブを強制的に破棄してもよろしいですか?ジョブは破棄済みとしてマークされますが、実行中のジョブは停止されません。ただし、失敗した場合は再試行されません。
+
+          '
         confirm_reschedule: ジョブを再スケジュールしてもよろしいですか？
         confirm_retry: ジョブを再試行してもよろしいですか？
         destroy: ジョブを削除
         discard: ジョブを破棄
+        force_discard: ジョブを強制的に破棄する
         reschedule: ジョブを再スケジュール
         retry: ジョブを再試行
       destroy:
@@ -124,6 +129,8 @@ ja:
         in_queue: 待機中
         runtime: 実行時間
         title: 実行
+      force_discard:
+        notice: ジョブは強制的に破棄されました。実行は継続されますが、失敗した場合は再試行されません
       index:
         job_pagination: ジョブのページネーション
         older_jobs: 古いジョブ

data/config/locales/nl.yml

@@ -4,6 +4,7 @@ nl:
     actions:
       destroy: Vernietigen
       discard: Weggooien
+      force_discard: Forceer weggooien
       inspect: Inspecteren
       reschedule: Opnieuw plannen
       retry: Opnieuw proberen
@@ -110,10 +111,14 @@ nl:
       actions:
         confirm_destroy: Weet je zeker dat je de baan wilt vernietigen?
         confirm_discard: Wilt u de baan afwijzen?
+        confirm_force_discard: 'Weet u zeker dat u deze taak geforceerd wilt weggooien? De taak wordt gemarkeerd als verwijderd, maar de lopende taak wordt niet gestopt. Bij fouten wordt deze echter niet opnieuw geprobeerd.
+
+          '
         confirm_reschedule: Weet u zeker dat u de taak opnieuw wilt inplannen?
         confirm_retry: Weet u zeker dat u de taak opnieuw wilt proberen?
         destroy: Baan vernietigen
         discard: Gooi de baan weg
+        force_discard: Forceer taak weggooien
         reschedule: Taak opnieuw plannen
         retry: Taak opnieuw proberen
       destroy:
@@ -124,6 +129,8 @@ nl:
         in_queue: in de wachtrij
         runtime: looptijd
         title: Executies
+      force_discard:
+        notice: Baan is gedwongen verwijderd. Het blijft actief, maar wordt niet opnieuw geprobeerd als er fouten optreden
       index:
         job_pagination: Taak paginering
         older_jobs: Oudere banen

data/config/locales/ru.yml

@@ -4,6 +4,7 @@ ru:
     actions:
       destroy: Разрушать
       discard: Отказаться
+      force_discard: Принудительно отменить
       inspect: Осмотреть
       reschedule: Перенести
       retry: Повторить попытку
@@ -134,10 +135,14 @@ ru:
       actions:
         confirm_destroy: Вы уверены, что хотите уничтожить задание?
         confirm_discard: Вы уверены, что хотите отказаться от задания?
+        confirm_force_discard: 'Вы уверены, что хотите принудительно отменить это задание? Задание будет помечено как отброшенное, но выполняемое задание не будет остановлено, однако в случае сбоя оно не будет повторено.
+
+          '
         confirm_reschedule: Вы уверены, что хотите перенести задание?
         confirm_retry: Вы уверены, что хотите повторить задание?
         destroy: Уничтожить работу
         discard: Отменить задание
+        force_discard: Принудительно отменить задание
         reschedule: Перенести задание
         retry: Повторить задание
       destroy:
@@ -148,6 +153,8 @@ ru:
         in_queue: в очереди
         runtime: время выполнения
         title: Казни
+      force_discard:
+        notice: Иов был принудительно отброшен. Он продолжит работу, но не будет повторяться в случае сбоя.
       index:
         job_pagination: Пагинация вакансий
         older_jobs: Старые рабочие места

data/config/locales/tr.yml

@@ -4,6 +4,7 @@ tr:
     actions:
       destroy: Sil
       discard: İptal Et
+      force_discard: Atmaya zorla
       inspect: İncele
       reschedule: Yeniden planla
       retry: Tekrar dene
@@ -110,10 +111,14 @@ tr:
       actions:
         confirm_destroy: Bu işi silmek istediğinizden emin misiniz?
         confirm_discard: Bu işi iptal etmek istediğinizden emin misiniz?
+        confirm_force_discard: 'Bu işi zorla iptal etmek istediğinizden emin misiniz? İş atıldı olarak işaretlenecek ancak devam eden iş durdurulmayacak; ancak başarısızlık durumunda yeniden denenmeyecek.
+
+          '
         confirm_reschedule: Bu işi yeniden planlamak istediğinizden emin misiniz?
         confirm_retry: Bu işi tekrar denemek istediğinizden emin misiniz?
         destroy: İşi Sil
         discard: İşi İptal Et
+        force_discard: İşi zorla atmaya zorla
         reschedule: İşi Yeniden Planla
         retry: İşi Tekrar Dene
       destroy:
@@ -124,6 +129,8 @@ tr:
         in_queue: sırada
         runtime: çalışma süresi
         title: İşlemler
+      force_discard:
+        notice: İş zorla atıldı. Çalışmaya devam edecek ancak arıza durumunda yeniden denenmeyecek
       index:
         job_pagination: İş sayfalandırması
         older_jobs: Daha eski işler

data/config/locales/uk.yml

@@ -4,6 +4,7 @@ uk:
     actions:
       destroy: Видалити
       discard: Відхилити
+      force_discard: Примусово скинути
       inspect: Оглянути
       reschedule: Перепланувати
       retry: Повторити
@@ -134,10 +135,14 @@ uk:
       actions:
         confirm_destroy: Ви впевнені, що хочете видалити завдання?
         confirm_discard: Ви впевнені, що хочете відхилити завдання?
+        confirm_force_discard: 'Ви впевнені, що хочете примусово скасувати цю роботу? Завдання буде позначено як відхилене, але виконуване завдання не буде зупинено – однак його не буде повторено у випадку помилок.
+
+          '
         confirm_reschedule: Ви впевнені, що хочете перепланувати завдання?
         confirm_retry: Ви впевнені, що хочете повторити завдання?
         destroy: Видалити завдання
         discard: Відхилити завдання
+        force_discard: Примусово скасувати завдання
         reschedule: Перепланувати завдання
         retry: Повторити завдання
       destroy:
@@ -148,6 +153,8 @@ uk:
         in_queue: у черзі
         runtime: час виконання
         title: Виконання
+      force_discard:
+        notice: Роботу примусово скасовано. Він продовжуватиме працювати, але не буде повторюватися в разі помилок
       index:
         job_pagination: Пагінація робіт
         older_jobs: Старі роботи

data/config/routes.rb

@@ -11,6 +11,7 @@ GoodJob::Engine.routes.draw do
 
     member do
       put :discard
+      put :force_discard
       put :reschedule
       put :retry
     end

data/lib/good_job/callable.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module GoodJob
+  # An object that has case-equality to a Proc or Lambda by responding to #call.
+  # This can be used to duck-type match in a case statement.
+  module Callable
+    # Whether the object responds to #call
+    def self.===(other)
+      other.respond_to?(:call)
+    end
+  end
+end

data/lib/good_job/notifier.rb

@@ -24,6 +24,9 @@ module GoodJob # :nodoc:
     WAIT_INTERVAL = 1
     # Seconds to wait if database cannot be connected to
     RECONNECT_INTERVAL = 5
+    # Number of consecutive connection errors before reporting an error
+    CONNECTION_ERRORS_REPORTING_THRESHOLD = 6
+
     # Connection errors that will wait {RECONNECT_INTERVAL} before reconnecting
     CONNECTION_ERRORS = %w[
       ActiveRecord::ConnectionNotEstablished
@@ -31,7 +34,6 @@ module GoodJob # :nodoc:
       PG::UnableToSend
       PG::Error
     ].freeze
-    CONNECTION_ERRORS_REPORTING_THRESHOLD = 3
 
     # @!attribute [r] instances
     #   @!scope class
@@ -69,8 +71,8 @@ module GoodJob # :nodoc:
       @mutex = Mutex.new
       @shutdown_event = Concurrent::Event.new.tap(&:set)
       @running = Concurrent::AtomicBoolean.new(false)
-      @connected = Concurrent::AtomicBoolean.new(false)
-      @listening = Concurrent::AtomicBoolean.new(false)
+      @connected = Concurrent::Event.new
+      @listening = Concurrent::Event.new
       @connection_errors_count = Concurrent::AtomicFixnum.new(0)
       @connection_errors_reported = Concurrent::AtomicBoolean.new(false)
       @enable_listening = enable_listening
@@ -85,15 +87,25 @@ module GoodJob # :nodoc:
     end
 
     # Tests whether the notifier is active and has acquired a dedicated database connection.
+    # @param timeout [Numeric, nil] Seconds to wait for condition to be true, -1 is forever
     # @return [true, false, nil]
-    def connected?
-      @connected.true?
+    def connected?(timeout: nil)
+      if timeout.nil?
+        @connected.set?
+      else
+        @connected.wait(timeout == -1 ? nil : timeout)
+      end
     end
 
     # Tests whether the notifier is listening for new messages.
+    # @param timeout [Numeric, nil] Seconds to wait for condition to be true, -1 is forever
     # @return [true, false, nil]
-    def listening?
-      @listening.true?
+    def listening?(timeout: nil)
+      if timeout.nil?
+        @listening.set?
+      else
+        @listening.wait(timeout == -1 ? nil : timeout)
+      end
     end
 
     def shutdown?
@@ -114,11 +126,12 @@ module GoodJob # :nodoc:
 
         if @executor.shutdown? || @task&.complete?
           # clean up in the even the executor is killed
-          @connected.make_false
-          @listening.make_false
+          @connected.reset
+          @listening.reset
           @shutdown_event.set
         else
           @shutdown_event.wait(timeout == -1 ? nil : timeout) unless timeout.nil?
+          @connected.reset if @shutdown_event.set?
         end
         @shutdown_event.set?
       end
@@ -152,6 +165,7 @@ module GoodJob # :nodoc:
         if connection_error
           @connection_errors_count.increment
           if @connection_errors_reported.false? && @connection_errors_count.value >= CONNECTION_ERRORS_REPORTING_THRESHOLD
+            @connected.reset
             GoodJob._on_thread_error(thread_error)
             @connection_errors_reported.make_true
           end
@@ -180,15 +194,17 @@ module GoodJob # :nodoc:
     end
 
     def create_listen_task(delay: 0)
-      @task = Concurrent::ScheduledTask.new(delay, args: [@recipients, @running, @executor, @enable_listening, @listening], executor: @executor) do |thr_recipients, thr_running, thr_executor, thr_enable_listening, thr_listening|
+      @task = Concurrent::ScheduledTask.new(delay, args: [@recipients, @running, @executor, @enable_listening, @connected, @listening], executor: @executor) do |thr_recipients, thr_running, thr_executor, thr_enable_listening, thr_connected, thr_listening|
         with_connection do
+          thr_connected.set
+
           begin
             Rails.application.executor.wrap do
               run_callbacks :listen do
                 if thr_enable_listening
                   ActiveSupport::Notifications.instrument("notifier_listen.good_job") do
                     connection.execute("LISTEN #{CHANNEL}")
-                    thr_listening.make_true
+                    thr_listening.set
                   end
                 end
               end
@@ -216,7 +232,7 @@ module GoodJob # :nodoc:
             run_callbacks :unlisten do
               if thr_enable_listening
                 ActiveSupport::Notifications.instrument("notifier_unlisten.good_job") do
-                  thr_listening.make_false
+                  thr_listening.reset
                   connection.execute("UNLISTEN *")
                 end
               end
@@ -237,11 +253,9 @@ module GoodJob # :nodoc:
         end
       end
       connection.execute("SET application_name = #{connection.quote(self.class.name)}")
-      @connected.make_true
 
       yield
     ensure
-      @connected.make_false
       connection&.disconnect!
       self.connection = nil
     end

data/lib/good_job/probe_server.rb

@@ -37,7 +37,7 @@ module GoodJob
         started ? [200, {}, ["Started"]] : [503, {}, ["Not started"]]
       when '/status/connected'
         connected = GoodJob::Scheduler.instances.any? && GoodJob::Scheduler.instances.all?(&:running?) &&
-                    GoodJob::Notifier.instances.any? && GoodJob::Notifier.instances.all?(&:listening?)
+                    GoodJob::Notifier.instances.any? && GoodJob::Notifier.instances.all?(&:connected?)
         connected ? [200, {}, ["Connected"]] : [503, {}, ["Not connected"]]
       else
         [404, {}, ["Not found"]]

data/lib/good_job/version.rb

@@ -2,7 +2,7 @@
 
 module GoodJob
   # GoodJob gem version.
-  VERSION = '3.18.2'
+  VERSION = '3.19.0'
 
   # GoodJob version as Gem::Version object
   GEM_VERSION = Gem::Version.new(VERSION)

data/lib/good_job.rb

@@ -16,6 +16,7 @@ require "good_job/active_job_extensions/notify_options"
 
 require "good_job/assignable_connection"
 require "good_job/bulk"
+require "good_job/callable"
 require "good_job/capsule"
 require "good_job/cleanup_tracker"
 require "good_job/cli"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 3.18.2
+  version: 3.19.0
 platform: ruby
 authors:
 - Ben Sheldon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-02 00:00:00.000000000 Z
+date: 2023-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -122,62 +122,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: dotenv
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.7.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.7.6
-- !ruby/object:Gem::Dependency
-  name: foreman
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: gem-release
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: github_changelog_generator
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
@@ -369,6 +313,7 @@ files:
 - app/views/good_job/shared/icons/_clock.html.erb
 - app/views/good_job/shared/icons/_dash_circle.html.erb
 - app/views/good_job/shared/icons/_dots.html.erb
+- app/views/good_job/shared/icons/_eject.html.erb
 - app/views/good_job/shared/icons/_exclamation.html.erb
 - app/views/good_job/shared/icons/_info.html.erb
 - app/views/good_job/shared/icons/_moon_stars_fill.html.erb
@@ -408,6 +353,7 @@ files:
 - lib/good_job/adapter.rb
 - lib/good_job/assignable_connection.rb
 - lib/good_job/bulk.rb
+- lib/good_job/callable.rb
 - lib/good_job/capsule.rb
 - lib/good_job/cleanup_tracker.rb
 - lib/good_job/cli.rb