Expose timeout for lock via environment variable configuration

lib/resque/scheduler/cli.rb

@@ -15,7 +15,8 @@ module Scheduler
  quiet: 'QUIET',
  pidfile: 'PIDFILE',
  poll_sleep_amount: 'RESQUE_SCHEDULER_INTERVAL',
- verbose: 'VERBOSE'
+ verbose: 'VERBOSE',
+ timeout: 'TIMEOUT'
  }.freeze
 
  class Cli

lib/resque/scheduler/configuration.rb

@@ -80,6 +80,13 @@ def poll_sleep_amount
  Float(environment.fetch('RESQUE_SCHEDULER_INTERVAL', '5'))
  end
 
+ # Sets timeout for Resque::Scheduler::Lock::Base
+ attr_writer :lock_timeout
+
+ def lock_timeout
+ @lock_timeout ||= environment.fetch('LOCK_TIMEOUT', 60 * 3).to_i
+ end
+
  private
 
  # Copied from https://github.com/rails/rails/blob/main/activemodel/lib/active_model/type/boolean.rb#L17

lib/resque/scheduler/env.rb

@@ -56,21 +56,21 @@ def setup_pid_file
 
  def setup_scheduler_configuration
  Resque::Scheduler.configure do |c|
- c.app_name = options[:app_name] if options.key?(:app_name)
-
- c.dynamic = !!options[:dynamic] if options.key?(:dynamic)
-
- c.env = options[:env] if options.key?(:env)
-
- c.logfile = options[:logfile] if options.key?(:logfile)
-
- c.logformat = options[:logformat] if options.key?(:logformat)
+ [
+ :app_name,
+ :dynamic,
+ :env,
+ :logfile,
+ :logformat,
+ :lock_timeout,
+ :verbose
+ ].each do |option_key|
+ c.send("#{option_key}=", options[option_key]) if options.key?(option_key)
+ end
 
  if (psleep = options[:poll_sleep_amount]) && !psleep.nil?
  c.poll_sleep_amount = Float(psleep)
  end
-
- c.verbose = !!options[:verbose] if options.key?(:verbose)
  end
  end
 

lib/resque/scheduler/lock/base.rb

@@ -11,7 +11,7 @@ def initialize(key, options = {})
  @key = key
 
  # 3 minute default timeout
- @timeout = options[:timeout] || 60 * 3
+ @timeout = options[:timeout] || Resque::Scheduler.lock_timeout
  end
 
  # Attempts to acquire the lock. Returns true if successfully acquired.

test/configuration_test.rb

@@ -19,6 +19,12 @@
  end
  end
 
+ test 'setting lock_timeout from environment' do
+ configuration.environment = { 'LOCK_TIMEOUT' => '47' }
+
+ assert_equal 47, configuration.lock_timeout
+ end
+
  test 'env set from Rails.env' do
  Rails.expects(:env).returns('development')