Port more code from Puma

lib/delayed/launcher/cluster.rb

@@ -351,7 +351,13 @@ def cull_childs
 
  logger.debug "Culling #{diff.inspect} workers"
 
- handles_to_cull = @child_handles[-diff, diff]
+ handles_to_cull =
+ case @options[:worker_culling_strategy]
+ when :youngest
+ @child_handles.sort_by(&:started_at)[-diff, diff]
+ when :oldest
+ @child_handles.sort_by(&:started_at)[0, diff]
+ end
  logger.debug "Workers to cull: #{handles_to_cull.inspect}"
 
  handles_to_cull.each do |handle|
@@ -387,10 +393,10 @@ def spawn_childs
  end
 
  def next_child_index
- all_positions = 0...@child_count
  occupied_positions = @child_handles.map(&:index)
- available_positions = all_positions.to_a - occupied_positions
- available_positions.first
+ idx = 0
+ idx += 1 until !occupied_positions.include?(idx)
+ idx
  end
 
  def spawn_child(idx, parent)

lib/delayed/launcher/forking.rb

@@ -28,11 +28,13 @@ def initialize(options)
  options.delete(:args)
 
  # Set default options
+ options[:worker_count] ||= 1
  options[:worker_check_interval] ||= DEFAULT_WORKER_CHECK_INTERVAL
  options[:worker_timeout] ||= DEFAULT_WORKER_TIMEOUT
  options[:worker_boot_timeout] ||= DEFAULT_WORKER_TIMEOUT
  options[:worker_shutdown_timeout] ||= DEFAULT_WORKER_SHUTDOWN_TIMEOUT
- options[:worker_count] ||= 1
+ # TODO: need phased restart timeout
+ options[:worker_culling_strategy] ||= :youngest
  options.delete(:pools) if options[:pools] == []
  options[:pid_dir] ||= "#{Delayed.root}/tmp/pids"
  options[:log_dir] ||= "#{Delayed.root}/log"
@@ -49,9 +51,9 @@ def run
  end
 
  # Begin graceful shutdown of the workers
- def stop(timeout = nil)
+ def stop
  # @status = :stop
- @runner.stop(timeout)
+ @runner.stop
  end
 
  # Begin forced shutdow nof the workers