Extract Processes::Poller concern to be used in Dispatcher and Worker

Also, remove the idle threads value from metadata, because it's useless.

Author: rosa

lib/solid_queue.rb

@@ -10,6 +10,7 @@
 require "solid_queue/processes/interruptible"
 require "solid_queue/processes/pidfile"
 require "solid_queue/processes/procline"
+require "solid_queue/processes/poller"
 require "solid_queue/processes/base"
 require "solid_queue/processes/runnable"
 require "solid_queue/signals"

lib/solid_queue/dispatcher.rb

@@ -2,9 +2,9 @@
 
 module SolidQueue
   class Dispatcher < Processes::Base
-    include Processes::Runnable
+    include Processes::Runnable, Processes::Poller
 
-    attr_accessor :batch_size, :polling_interval, :concurrency_maintenance_interval
+    attr_accessor :batch_size, :concurrency_maintenance_interval
 
     set_callback :boot, :after, :launch_concurrency_maintenance
     set_callback :shutdown, :before, :stop_concurrency_maintenance
@@ -67,7 +67,7 @@ def initial_jitter
       end
 
       def metadata
-        super.merge(batch_size: batch_size, polling_interval: polling_interval)
+        super.merge(batch_size: batch_size)
       end
   end
 end

lib/solid_queue/processes/poller.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module SolidQueue::Processes
+  module Poller
+    extend ActiveSupport::Concern
+
+    included do
+      attr_accessor :polling_interval
+    end
+
+    private
+      def with_polling_volume
+        if SolidQueue.silence_polling?
+          ActiveRecord::Base.logger.silence { yield }
+        else
+          yield
+        end
+      end
+
+      def metadata
+        super.merge(polling_interval: polling_interval)
+      end
+  end
+end

lib/solid_queue/processes/runnable.rb

@@ -73,13 +73,5 @@ def all_work_completed?
     def running_inline?
       mode.inline?
     end
-
-    def with_polling_volume
-      if SolidQueue.silence_polling?
-        ActiveRecord::Base.logger.silence { yield }
-      else
-        yield
-      end
-    end
   end
 end

lib/solid_queue/worker.rb

@@ -2,9 +2,9 @@
 
 module SolidQueue
   class Worker < Processes::Base
-    include Processes::Runnable
+    include Processes::Runnable, Processes::Poller
 
-    attr_accessor :queues, :polling_interval, :pool
+    attr_accessor :queues, :pool
 
     def initialize(**options)
       options = options.dup.with_defaults(SolidQueue::Configuration::WORKER_DEFAULTS)
@@ -48,7 +48,7 @@ def all_work_completed?
       end
 
       def metadata
-        super.merge(queues: queues.join(","), thread_pool_size: pool.size, idle_threads: pool.idle_threads, polling_interval: polling_interval)
+        super.merge(queues: queues.join(","), thread_pool_size: pool.size)
       end
   end
 end

test/unit/dispatcher_test.rb

@@ -12,6 +12,15 @@ class DispatcherTest < ActiveSupport::TestCase
     @dispatcher.stop
   end
 
+  test "dispatcher is registered as process" do
+    @dispatcher.start
+    wait_for_registered_processes(1, timeout: 1.second)
+
+    process = SolidQueue::Process.first
+    assert_equal "Dispatcher", process.kind
+    assert_equal({ "polling_interval" => 0.1, "batch_size" => 10 }, process.metadata)
+  end
+
   test "polling queries are logged" do
     log = StringIO.new
     old_logger, ActiveRecord::Base.logger = ActiveRecord::Base.logger, ActiveSupport::Logger.new(log)

test/unit/worker_test.rb

@@ -13,6 +13,15 @@ class WorkerTest < ActiveSupport::TestCase
     JobBuffer.clear
   end
 
+  test "worker is registered as process" do
+    @worker.start
+    wait_for_registered_processes(1, timeout: 1.second)
+
+    process = SolidQueue::Process.first
+    assert_equal "Worker", process.kind
+    assert_equal({ "queues" => "background", "polling_interval" => 0.2, "thread_pool_size" => 3 }, process.metadata)
+  end
+
   test "errors on claiming executions are reported via Rails error subscriber regardless of on_thread_error setting" do
     original_on_thread_error, SolidQueue.on_thread_error = SolidQueue.on_thread_error, nil