solid_queue 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 490264bacfa32881edc69e3fa349081bfa1666785db38c7df55824ab6bd538b4
-  data.tar.gz: b12570f172afad018ac4709c7203276c0ba737ff90654cae02cadc3197be0357
+  metadata.gz: 50d118a41d39dff4da741a1e7fb105b47571dd719b883fb53843e7b57f7aff66
+  data.tar.gz: a1dc7ff9b71a07f41fab851ea0dd2f16170240e2a465098f98e75a96c33edb4b
 SHA512:
-  metadata.gz: b5909c1a726457b029d0de62bd22bf6929d84ebcddf35a56a8a0af10a0be7108ca1eb60ed48294ef77013f03d9e3c0f9b87a34d1e54ec966742abf79f5edd41f
-  data.tar.gz: daec7288a9652399f5dd75c0c6d8a5d5def60f9772a122a8b6212a675bb2d5e6ccee831156afd59b624204c694276f5011df64a122df7d44b578e848798cb5fe
+  metadata.gz: f344e6ba1a395f014fc08437c1322eac9b3f5218874f4b824cacab042d20053ee9a5504601e37864e04ccc956fc1f08fe35979c9d4a7b19dc42cc53ae5502c56
+  data.tar.gz: 27e1d8c00e2c68330d52e938bb00ecadaf246678e16b12b0e1269f8a4e8e3328a972b5a007a04d2839baf2edb480e9f0cae3b6099cd6009a75b11e85858ee6e2

data/app/models/solid_queue/failed_execution.rb

@@ -21,6 +21,7 @@ module SolidQueue
     def retry
       SolidQueue.instrument(:retry, job_id: job.id) do
         with_lock do
+          job.reset_execution_counters
           job.prepare_for_execution
           destroy!
         end

data/app/models/solid_queue/job/executable.rb

@@ -6,16 +6,14 @@ module SolidQueue
       extend ActiveSupport::Concern
 
       included do
-        include ConcurrencyControls, Schedulable
+        include ConcurrencyControls, Schedulable, Retryable
 
         has_one :ready_execution
         has_one :claimed_execution
-        has_one :failed_execution
 
         after_create :prepare_for_execution
 
         scope :finished, -> { where.not(finished_at: nil) }
-        scope :failed, -> { includes(:failed_execution).where.not(failed_execution: { id: nil }) }
       end
 
       class_methods do
@@ -97,18 +95,10 @@ module SolidQueue
         end
       end
 
-      def retry
-        failed_execution&.retry
-      end
-
       def discard
         execution&.discard
       end
 
-      def failed_with(exception)
-        FailedExecution.create_or_find_by!(job_id: id, exception: exception)
-      end
-
       private
         def ready
           ReadyExecution.create_or_find_by!(job_id: id)

data/app/models/solid_queue/job/retryable.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module SolidQueue
+  class Job
+    module Retryable
+      extend ActiveSupport::Concern
+
+      included do
+        has_one :failed_execution
+
+        scope :failed, -> { includes(:failed_execution).where.not(failed_execution: { id: nil }) }
+      end
+
+      def retry
+        failed_execution&.retry
+      end
+
+      def failed_with(exception)
+        FailedExecution.create_or_find_by!(job_id: id, exception: exception)
+      end
+
+      def reset_execution_counters
+        arguments["executions"] = 0
+        arguments["exception_executions"] = {}
+        save!
+      end
+    end
+  end
+end

data/app/models/solid_queue/ready_execution.rb

@@ -24,20 +24,21 @@ module SolidQueue
           return [] if limit <= 0
 
           transaction do
-            job_ids = select_candidates(queue_relation, limit)
-            lock_candidates(job_ids, process_id)
+            candidates = select_candidates(queue_relation, limit)
+            lock_candidates(candidates, process_id)
           end
         end
 
         def select_candidates(queue_relation, limit)
-          queue_relation.ordered.limit(limit).non_blocking_lock.pluck(:job_id)
+          queue_relation.ordered.limit(limit).non_blocking_lock.select(:id, :job_id)
         end
 
-        def lock_candidates(job_ids, process_id)
-          return [] if job_ids.none?
+        def lock_candidates(executions, process_id)
+          return [] if executions.none?
 
-          SolidQueue::ClaimedExecution.claiming(job_ids, process_id) do |claimed|
-            where(job_id: claimed.pluck(:job_id)).delete_all
+          SolidQueue::ClaimedExecution.claiming(executions.map(&:job_id), process_id) do |claimed|
+            ids_to_delete = executions.index_by(&:job_id).values_at(*claimed.map(&:job_id)).map(&:id)
+            where(id: ids_to_delete).delete_all
           end
         end
 

data/lib/solid_queue/engine.rb

@@ -24,9 +24,9 @@ module SolidQueue
       SolidQueue.on_thread_error = config.solid_queue.on_thread_error
     end
 
-    initializer "solid_queue.logger" do |app|
+    initializer "solid_queue.logger" do
       ActiveSupport.on_load(:solid_queue) do
-        self.logger ||= app.logger
+        self.logger = ::Rails.logger if logger == SolidQueue::DEFAULT_LOGGER
       end
 
       SolidQueue::LogSubscriber.attach_to :solid_queue

data/lib/solid_queue/version.rb

@@ -1,3 +1,3 @@
 module SolidQueue
-  VERSION = "0.3.1"
+  VERSION = "0.3.3"
 end

data/lib/solid_queue.rb

@@ -20,7 +20,9 @@ loader.setup
 module SolidQueue
   extend self
 
-  mattr_accessor :logger, default: ActiveSupport::Logger.new($stdout)
+  DEFAULT_LOGGER = ActiveSupport::Logger.new($stdout)
+
+  mattr_accessor :logger, default: DEFAULT_LOGGER
   mattr_accessor :app_executor, :on_thread_error, :connects_to
 
   mattr_accessor :use_skip_locked, default: true
@@ -56,4 +58,6 @@ module SolidQueue
   def instrument(channel, **options, &block)
     ActiveSupport::Notifications.instrument("#{channel}.solid_queue", **options, &block)
   end
+
+  ActiveSupport.run_load_hooks(:solid_queue, self)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solid_queue
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Rosa Gutierrez
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-20 00:00:00.000000000 Z
+date: 2024-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -56,30 +56,30 @@ dependencies:
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: fugit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -199,6 +199,7 @@ files:
 - app/models/solid_queue/job/concurrency_controls.rb
 - app/models/solid_queue/job/executable.rb
 - app/models/solid_queue/job/recurrable.rb
+- app/models/solid_queue/job/retryable.rb
 - app/models/solid_queue/job/schedulable.rb
 - app/models/solid_queue/pause.rb
 - app/models/solid_queue/process.rb