Skip to content

Commit ed14d39

Browse files
committed
Simplify valid_recurring_config?
1 parent 46f109b commit ed14d39

1 file changed

Lines changed: 14 additions & 18 deletions

File tree

lib/solid_queue/configuration.rb

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -70,34 +70,30 @@ def standalone?
7070
end
7171

7272
def valid_recurring_config?
73-
invalid = false
7473
invalid_tasks = Hash.new {|hash, key| hash[key] = [] }
7574
load_config_from(options[:recurring_schedule_file]).each do |env, tasks|
7675
tasks.each do |id, options|
7776
task = RecurringTask.from_configuration(id, **options)
78-
if task.invalid?
79-
invalid_tasks[env] << task
80-
invalid = true
81-
end
77+
invalid_tasks[env] << task if task.invalid?
8278
end
8379
end
8480

85-
if invalid
86-
puts "Invalid recurring tasks:"
87-
invalid_tasks.each do |env, tasks|
88-
puts "- #{env}"
89-
tasks.each do |task|
90-
puts " - #{task.key}"
91-
task.errors.full_messages.each do |message|
92-
puts " - #{message}"
93-
end
81+
if invalid_tasks.empty?
82+
puts "All recurring tasks are valid"
83+
return true
84+
end
85+
86+
puts "Invalid recurring tasks:"
87+
invalid_tasks.each do |env, tasks|
88+
puts "- #{env}"
89+
tasks.each do |task|
90+
puts " - #{task.key}"
91+
task.errors.full_messages.each do |message|
92+
puts " - #{message}"
9493
end
9594
end
96-
false
97-
else
98-
puts "All recurring tasks are valid"
99-
true
10095
end
96+
false
10197
end
10298

10399
private

0 commit comments

Comments
 (0)