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
8 changes: 8 additions & 0 deletions app/models/solid_queue/recurring_task.rb
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ def enqueue(at:)

perform_later.tap do |job|
unless job.successfully_enqueued?
report_enqueue_error(job.enqueue_error, at: at)
payload[:enqueue_error] = job.enqueue_error&.message
end
end
Expand All @@ -98,6 +99,7 @@ def enqueue(at:)
payload[:skipped] = true
false
rescue Job::EnqueueError => error
report_enqueue_error(error, at: at)
payload[:enqueue_error] = error.message
false
end
Expand Down Expand Up @@ -198,5 +200,11 @@ def enqueue_options
def default_time_zone
SolidQueue.time_zone
end

def report_enqueue_error(error, at:)
if error
Rails.error.report(error, handled: true, source: "application.solid_queue", context: { task: key, at: at })
end
end
end
end
47 changes: 47 additions & 0 deletions test/models/solid_queue/recurring_task_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,46 @@ def perform
end
end

test "reports Job::EnqueueError to Rails.error when enqueuing via Solid Queue" do
SolidQueue::Job.stubs(:create!).raises(ActiveRecord::Deadlocked)
subscriber = ErrorBuffer.new
at = Time.now

with_error_subscriber(subscriber) do
task = recurring_task_with(class_name: "JobWithoutArguments")
task.enqueue(at: at)
end

assert_equal 1, subscriber.errors.count
error, options = subscriber.errors.first
assert_kind_of SolidQueue::Job::EnqueueError, error
assert_match "ActiveRecord::Deadlocked", error.message
assert_equal true, options[:handled]
assert_equal "application.solid_queue", options[:source]
assert_equal "task-id", options[:context][:task]
assert_equal at, options[:context][:at]
end

test "reports enqueue error to Rails.error when using another adapter" do
ActiveJob::QueueAdapters::AsyncAdapter.any_instance.stubs(:enqueue).raises(ActiveJob::EnqueueError.new("All is broken"))
subscriber = ErrorBuffer.new
at = Time.now

with_error_subscriber(subscriber) do
task = recurring_task_with(class_name: "JobUsingAsyncAdapter")
task.enqueue(at: at)
end

assert_equal 1, subscriber.errors.count
error, options = subscriber.errors.first
assert_kind_of ActiveJob::EnqueueError, error
assert_equal "All is broken", error.message
assert_equal true, options[:handled]
assert_equal "application.solid_queue", options[:source]
assert_equal "task-id", options[:context][:task]
assert_equal at, options[:context][:at]
end

private
def with_time_zone(zone)
previous = SolidQueue.time_zone
Expand Down Expand Up @@ -344,4 +384,11 @@ def run_all_jobs_inline
worker.start
end
end

def with_error_subscriber(subscriber)
Rails.error.subscribe(subscriber)
yield
ensure
Rails.error.unsubscribe(subscriber) if Rails.error.respond_to?(:unsubscribe)
end
end
Loading