app/models/scheduled_task.rb in tasks_scheduler-0.6.12 vs app/models/scheduled_task.rb in tasks_scheduler-0.6.13
- old
+ new
@@ -13,20 +13,20 @@
DEFAULT_TIMEOUT = 12.hours
class << self
def rake_tasks
@rake_tasks ||= begin
- Rails.application.load_tasks
+ Rails.application.load_tasks if Rake.application.tasks.empty?
Rake.application.tasks.map(&:name)
end
end
def timeout
@timeout ||= begin
r = Integer(ENV[DEFAULT_TIMEOUT_ENVVAR_NAME])
r.positive? ? r.seconds : DEFAULT_TIMEOUT
- rescue ArgumentError, TypeError
- DEFAULT_TIMEOUT
+ rescue ArgumentError, TypeError
+ DEFAULT_TIMEOUT
end
end
end
enable_listable