Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/solid_queue/configuration.rb
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ def load_config_from_file(file)
if file.exist?
ActiveSupport::ConfigurationFile.parse(file).deep_symbolize_keys
else
puts "[solid_queue] WARNING: Provided configuration file '#{file}' does not exist. Falling back to default configuration."
{}
end
end
Expand Down
19 changes: 15 additions & 4 deletions test/unit/configuration_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@ class ConfigurationTest < ActiveSupport::TestCase
assert_processes configuration, :dispatcher, 1, batch_size: SolidQueue::Configuration::DISPATCHER_DEFAULTS[:batch_size]
end

test "warns if provided configuration file does not exist" do
assert_output "[solid_queue] WARNING: Provided configuration file '/path/to/nowhere.yml' does not exist. Falling back to default configuration.\n" do
configuration = SolidQueue::Configuration.new(config_file: Pathname.new("/path/to/nowhere.yml"))
assert configuration.valid?
end
end

test "read configuration from default file" do
configuration = SolidQueue::Configuration.new
assert 3, configuration.configured_processes.count
Expand Down Expand Up @@ -120,16 +127,20 @@ class ConfigurationTest < ActiveSupport::TestCase
assert error.include?("periodic_invalid_class: Class name doesn't correspond to an existing class")
assert error.include?("periodic_incorrect_schedule: Schedule is not a supported recurring schedule")

assert SolidQueue::Configuration.new(recurring_schedule_file: config_file_path(:empty_recurring)).valid?
assert_output(/Provided configuration file '[^']+' does not exist\./) do
assert SolidQueue::Configuration.new(recurring_schedule_file: config_file_path(:empty_recurring)).valid?
end
assert SolidQueue::Configuration.new(skip_recurring: true).valid?

configuration = SolidQueue::Configuration.new(recurring_schedule_file: config_file_path(:recurring_with_production_only))
assert configuration.valid?
assert_processes configuration, :scheduler, 0

configuration = SolidQueue::Configuration.new(recurring_schedule_file: config_file_path(:recurring_with_empty))
assert configuration.valid?
assert_processes configuration, :scheduler, 0
assert_output(/Provided configuration file '[^']+' does not exist\./) do
configuration = SolidQueue::Configuration.new(recurring_schedule_file: config_file_path(:recurring_with_empty))
assert configuration.valid?
assert_processes configuration, :scheduler, 0
end

# No processes
configuration = SolidQueue::Configuration.new(skip_recurring: true, dispatchers: [], workers: [])
Expand Down