Extract polling_interval to scheduler configuration

Author: cupatea

lib/generators/solid_queue/install/templates/config/queue.yml

@@ -7,6 +7,8 @@ default: &default
       threads: 3
       processes: <%%= ENV.fetch("JOB_CONCURRENCY", 1) %>
       polling_interval: 0.1
+  scheduler:
+    polling_interval: 1
 
 development:
   <<: *default

lib/solid_queue/configuration.rb

@@ -28,6 +28,10 @@ def instantiate
       concurrency_maintenance_interval: 600
     }
 
+    SCHEDULER_DEFAULTS = {
+      polling_interval: 1
+    }
+
     DEFAULT_CONFIG_FILE_PATH = "config/queue.yml"
     DEFAULT_RECURRING_SCHEDULE_FILE_PATH = "config/recurring.yml"
 
@@ -93,7 +97,7 @@ def default_options
       end
 
       def invalid_tasks
-        static_recurring_tasks.select(&:invalid?)
+        recurring_tasks.select(&:invalid?)
       end
 
       def only_work?
@@ -122,11 +126,9 @@ def dispatchers
       end
 
       def schedulers
-        if !skip_recurring_tasks?
-          [ Process.new(:scheduler, recurring_tasks: static_recurring_tasks) ]
-        else
-          []
-        end
+        return [] if skip_recurring_tasks?
+
+        [ Process.new(:scheduler, { recurring_tasks:, **scheduler_options.with_defaults(SCHEDULER_DEFAULTS) }) ]
       end
 
       def workers_options
@@ -139,17 +141,25 @@ def dispatchers_options
           .map { |options| options.dup.symbolize_keys }
       end
 
-      def static_recurring_tasks
-        @static_recurring_tasks ||= recurring_tasks_config.map do |id, options|
+      def scheduler_options
+        @scheduler_options ||= processes_config.fetch(:scheduler, {}).dup.symbolize_keys
+      end
+
+      def recurring_tasks
+        @recurring_tasks ||= recurring_tasks_config.map do |id, options|
           RecurringTask.from_configuration(id, **options) if options&.has_key?(:schedule)
         end.compact
       end
 
       def processes_config
         @processes_config ||= config_from \
-          options.slice(:workers, :dispatchers).presence || options[:config_file],
-          keys: [ :workers, :dispatchers ],
-          fallback: { workers: [ WORKER_DEFAULTS ], dispatchers: [ DISPATCHER_DEFAULTS ] }
+          options.slice(:workers, :dispatchers, :scheduler).presence || options[:config_file],
+          keys: [ :workers, :dispatchers, :scheduler ],
+          fallback: {
+            workers: [ WORKER_DEFAULTS ],
+            dispatchers: [ DISPATCHER_DEFAULTS ],
+            scheduler: SCHEDULER_DEFAULTS
+          }
       end
 
       def recurring_tasks_config

lib/solid_queue/scheduler.rb

@@ -5,7 +5,7 @@ class Scheduler < Processes::Base
     include Processes::Runnable
     include LifecycleHooks
 
-    attr_reader :recurring_schedule
+    attr_reader :recurring_schedule, :polling_interval
 
     after_boot :run_start_hooks
     after_boot :schedule_recurring_tasks
@@ -15,6 +15,8 @@ class Scheduler < Processes::Base
 
     def initialize(recurring_tasks:, **options)
       @recurring_schedule = RecurringSchedule.new(recurring_tasks)
+      options = options.dup.with_defaults(SolidQueue::Configuration::SCHEDULER_DEFAULTS)
+      @polling_interval = options[:polling_interval]
 
       super(**options)
     end
@@ -24,8 +26,6 @@ def metadata
     end
 
     private
-      SLEEP_INTERVAL = 60 # Right now it doesn't matter, can be set to 1 in the future for dynamic tasks
-
       def run
         loop do
           break if shutting_down?
@@ -36,7 +36,7 @@ def run
             end
           end
 
-          interruptible_sleep(SLEEP_INTERVAL)
+          interruptible_sleep(polling_interval)
         end
       ensure
         SolidQueue.instrument(:shutdown_process, process: self) do

test/unit/scheduler_test.rb

@@ -70,10 +70,7 @@ class SchedulerTest < ActiveSupport::TestCase
   end
 
   test "updates metadata after adding dynamic task post-start" do
-    scheduler = SolidQueue::Scheduler.new(recurring_tasks: {}).tap do |s|
-      s.define_singleton_method(:interruptible_sleep) { |interval| sleep 0.1 }
-      s.start
-    end
+    scheduler = SolidQueue::Scheduler.new(recurring_tasks: {}, polling_interval: 0.1).tap(&:start)
 
     wait_for_registered_processes(1, timeout: 1.second)
 
@@ -109,10 +106,7 @@ class SchedulerTest < ActiveSupport::TestCase
       arguments: [ 42 ]
     )
 
-    scheduler = SolidQueue::Scheduler.new(recurring_tasks: {}).tap do |s|
-      s.define_singleton_method(:interruptible_sleep) { |interval| sleep 0.1 }
-      s.start
-    end
+    scheduler = SolidQueue::Scheduler.new(recurring_tasks: {}, polling_interval: 0.1).tap(&:start)
 
     wait_for_registered_processes(1, timeout: 1.second)