solid_queue 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e62ec09bbed1f2bcb96da96865c3516adbc254ad7cea234d3b6573ea001c758e
-  data.tar.gz: d78e7543194f3f6470bdb80c52ffca78c520a602d93423185c02ba82475bbda6
+  metadata.gz: c2734f6cbcc795345207dc0cf221bd2744f2f98449da8b0edfc8175f3bbd7869
+  data.tar.gz: c4b4c2eca7dcb93e86a2f69d220ba1b9f8817c1d52a7cd1ff137ed5ec84e50f8
 SHA512:
-  metadata.gz: e7cdceced9162911efdd0f2020042e45f7c73c74c506cf1d4958211b2cc34f02e96553d9910b3d3cca925f00e10960837be4872a33c3e44388e0b6c37cbcec31
-  data.tar.gz: d9a17282687ef9feaa4b357124411e9bd088bebb8c0ce6fd67ccf887e4d9cf20a431882e84b40f68ff5ca05a008258bf4d64b6ab86b675cb581be65154d1e39e
+  metadata.gz: 9d09b58e43c4bc19ad2ab89d10072b36b53a449e9602f5c5a8fc7b637e91d8472eb70f417148657e6b146e5cd1034025afdbe6d39fa2b9fc82ce6bba3997e57f
+  data.tar.gz: 27168fd2216fbca4e9b19677a7885b23663012d8aed7bf54c25be8335bd528a733b55790e662a30815b9ba24d824390372eff24ed0b9f72947b6ff4feeec17c5

data/app/models/solid_queue/claimed_execution.rb

@@ -29,8 +29,9 @@ class SolidQueue::ClaimedExecution < SolidQueue::Execution
     def release_all
       SolidQueue.instrument(:release_many_claimed) do |payload|
         includes(:job).tap do |executions|
-          payload[:size] = executions.size
           executions.each(&:release)
+
+          payload[:size] = executions.size
         end
       end
     end
@@ -38,11 +39,11 @@ class SolidQueue::ClaimedExecution < SolidQueue::Execution
     def fail_all_with(error)
       SolidQueue.instrument(:fail_many_claimed) do |payload|
         includes(:job).tap do |executions|
-          payload[:size] = executions.size
+          executions.each { |execution| execution.failed_with(error) }
+
           payload[:process_ids] = executions.map(&:process_id).uniq
           payload[:job_ids] = executions.map(&:job_id).uniq
-
-          executions.each { |execution| execution.failed_with(error) }
+          payload[:size] = executions.size
         end
       end
     end

data/app/models/solid_queue/process/executor.rb

@@ -8,7 +8,7 @@ module SolidQueue
       included do
         has_many :claimed_executions
 
-        after_destroy -> { claimed_executions.release_all }, if: :claims_executions?
+        after_destroy :release_all_claimed_executions
       end
 
       def fail_all_claimed_executions_with(error)
@@ -17,6 +17,12 @@ module SolidQueue
         end
       end
 
+      def release_all_claimed_executions
+        if claims_executions?
+          claimed_executions.release_all
+        end
+      end
+
       private
         def claims_executions?
           kind == "Worker"

data/app/models/solid_queue/process/prunable.rb

@@ -1,12 +1,6 @@
 # frozen_string_literal: true
 
 module SolidQueue
-  class ProcessPrunedError < RuntimeError
-    def initialize(last_heartbeat_at)
-      super("Process was found dead and pruned (last heartbeat at: #{last_heartbeat_at}")
-    end
-  end
-
   class Process
     module Prunable
       extend ActiveSupport::Concern
@@ -28,7 +22,7 @@ module SolidQueue
       end
 
       def prune
-        error = ProcessPrunedError.new(last_heartbeat_at)
+        error = Processes::ProcessPrunedError.new(last_heartbeat_at)
         fail_all_claimed_executions_with(error)
 
         deregister(pruned: true)

data/app/models/solid_queue/process.rb

@@ -4,7 +4,7 @@ class SolidQueue::Process < SolidQueue::Record
   include Executor, Prunable
 
   belongs_to :supervisor, class_name: "SolidQueue::Process", optional: true, inverse_of: :supervisees
-  has_many :supervisees, class_name: "SolidQueue::Process", inverse_of: :supervisor, foreign_key: :supervisor_id, dependent: :destroy
+  has_many :supervisees, class_name: "SolidQueue::Process", inverse_of: :supervisor, foreign_key: :supervisor_id
 
   store :metadata, coder: JSON
 
@@ -26,9 +26,18 @@ class SolidQueue::Process < SolidQueue::Record
   def deregister(pruned: false)
     SolidQueue.instrument :deregister_process, process: self, pruned: pruned do |payload|
       destroy!
+
+      unless supervised? || pruned
+        supervisees.each(&:deregister)
+      end
     rescue Exception => error
       payload[:error] = error
       raise
     end
   end
+
+  private
+    def supervised?
+      supervisor_id.present?
+    end
 end

data/db/migrate/20240813160053_make_name_not_null.rb

@@ -11,6 +11,6 @@ class MakeNameNotNull < ActiveRecord::Migration[7.1]
 
   def down
     remove_index :solid_queue_processes, [ :name, :supervisor_id ]
-    change_column :solid_queue_processes, :name, :string, null: false
+    change_column :solid_queue_processes, :name, :string, null: true
   end
 end

data/lib/solid_queue/configuration.rb

@@ -23,6 +23,11 @@ module SolidQueue
       recurring_tasks: []
     }
 
+    DEFAULT_CONFIG = {
+      workers: [ WORKER_DEFAULTS ],
+      dispatchers: [ DISPATCHER_DEFAULTS ]
+    }
+
     def initialize(mode: :fork, load_from: nil)
       @mode = mode.to_s.inquiry
       @raw_config = config_from(load_from)
@@ -61,22 +66,27 @@ module SolidQueue
       end
 
       def config_from(file_or_hash, env: Rails.env)
-        config = load_config_from(file_or_hash)
-        config[env.to_sym] ? config[env.to_sym] : config
+        load_config_from(file_or_hash).then do |config|
+          config = config[env.to_sym] ? config[env.to_sym] : config
+          if (config.keys & DEFAULT_CONFIG.keys).any? then config
+          else
+            DEFAULT_CONFIG
+          end
+        end
       end
 
       def workers_options
-        @workers_options ||= options_from_raw_config(:workers, WORKER_DEFAULTS)
+        @workers_options ||= options_from_raw_config(:workers)
           .map { |options| options.dup.symbolize_keys }
       end
 
       def dispatchers_options
-        @dispatchers_options ||= options_from_raw_config(:dispatchers, DISPATCHER_DEFAULTS)
+        @dispatchers_options ||= options_from_raw_config(:dispatchers)
           .map { |options| options.dup.symbolize_keys }
       end
 
-      def options_from_raw_config(key, defaults)
-        raw_config.empty? ? [ defaults ] : Array(raw_config[key])
+      def options_from_raw_config(key)
+        Array(raw_config[key])
       end
 
       def parse_recurring_tasks(tasks)

data/lib/solid_queue/processes/poller.rb

@@ -45,10 +45,12 @@ module SolidQueue::Processes
       end
 
       def with_polling_volume
-        if SolidQueue.silence_polling? && ActiveRecord::Base.logger
-          ActiveRecord::Base.logger.silence { yield }
-        else
-          yield
+        SolidQueue.instrument(:polling) do
+          if SolidQueue.silence_polling? && ActiveRecord::Base.logger
+            ActiveRecord::Base.logger.silence { yield }
+          else
+            yield
+          end
         end
       end
   end

data/lib/solid_queue/processes/process_exit_error.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module SolidQueue
+  module Processes
+    class ProcessExitError < RuntimeError
+      def initialize(status)
+        message = case
+        when status.exitstatus.present? then "Process pid=#{status.pid} exited with status #{status.  exitstatus}"
+        when status.signaled? then "Process pid=#{status.pid} received unhandled signal #{status. termsig}"
+        else "Process pid=#{status.pid} exited unexpectedly"
+        end
+
+        super(message)
+      end
+    end
+  end
+end

data/lib/solid_queue/processes/process_missing_error.rb

@@ -0,0 +1,9 @@
+module SolidQueue
+  module Processes
+    class ProcessMissingError < RuntimeError
+      def initialize
+        super("The process that was running this job no longer exists")
+      end
+    end
+  end
+end

data/lib/solid_queue/processes/process_pruned_error.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module SolidQueue
+  module Processes
+    class ProcessPrunedError < RuntimeError
+      def initialize(last_heartbeat_at)
+        super("Process was found dead and pruned (last heartbeat at: #{last_heartbeat_at}")
+      end
+    end
+  end
+end

data/lib/solid_queue/supervisor/fork_supervisor.rb

@@ -1,18 +1,6 @@
 # frozen_string_literal: true
 
 module SolidQueue
-  class ProcessExitError < RuntimeError
-    def initialize(status)
-      message = case
-      when status.exitstatus.present? then "Process pid=#{status.pid} exited with status #{status.exitstatus}"
-      when status.signaled? then "Process pid=#{status.pid} received unhandled signal #{status.termsig}"
-      else "Process pid=#{status.pid} exited unexpectedly"
-      end
-
-      super(message)
-    end
-  end
-
   class Supervisor::ForkSupervisor < Supervisor
     include Signals, Pidfiled
 
@@ -126,7 +114,7 @@ module SolidQueue
 
       def handle_claimed_jobs_by(terminated_fork, status)
         if registered_process = process.supervisees.find_by(name: terminated_fork.name)
-          error = ProcessExitError.new(status)
+          error = Processes::ProcessExitError.new(status)
           registered_process.fail_all_claimed_executions_with(error)
         end
       end

data/lib/solid_queue/supervisor/maintenance.rb

@@ -1,10 +1,4 @@
 module SolidQueue
-  class ProcessMissingError < RuntimeError
-    def initialize
-      super("The process that was running this job no longer exists")
-    end
-  end
-
   module Supervisor::Maintenance
     extend ActiveSupport::Concern
 
@@ -35,7 +29,7 @@ module SolidQueue
 
       def fail_orphaned_executions
         wrap_in_app_executor do
-          SolidQueue::ClaimedExecution.orphaned.fail_all_with(ProcessMissingError.new)
+          ClaimedExecution.orphaned.fail_all_with(Processes::ProcessMissingError.new)
         end
       end
   end

data/lib/solid_queue/supervisor.rb

@@ -9,8 +9,12 @@ module SolidQueue
         SolidQueue.supervisor = true
         configuration = Configuration.new(mode: mode, load_from: load_configuration_from)
 
-        klass = mode == :fork ? ForkSupervisor : AsyncSupervisor
-        klass.new(configuration).tap(&:start)
+        if configuration.configured_processes.any?
+          klass = mode == :fork ? ForkSupervisor : AsyncSupervisor
+          klass.new(configuration).tap(&:start)
+        else
+          abort "No workers or processed configured. Exiting..."
+        end
       end
     end
 

data/lib/solid_queue/version.rb

@@ -1,3 +1,3 @@
 module SolidQueue
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solid_queue
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Rosa Gutierrez
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-21 00:00:00.000000000 Z
+date: 2024-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -242,6 +242,9 @@ files:
 - lib/solid_queue/processes/callbacks.rb
 - lib/solid_queue/processes/interruptible.rb
 - lib/solid_queue/processes/poller.rb
+- lib/solid_queue/processes/process_exit_error.rb
+- lib/solid_queue/processes/process_missing_error.rb
+- lib/solid_queue/processes/process_pruned_error.rb
 - lib/solid_queue/processes/procline.rb
 - lib/solid_queue/processes/registrable.rb
 - lib/solid_queue/processes/runnable.rb