mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
68b471c4dd
The implementaiton of `instrument` in `ActiveJob::Instrumentation` was not keeping the API of `ActiveSupport::Notification.instrument` and returning the value of the block. Fixes #40931.
40 lines
1 KiB
Ruby
40 lines
1 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
module ActiveJob
|
|
module Instrumentation #:nodoc:
|
|
extend ActiveSupport::Concern
|
|
|
|
included do
|
|
around_enqueue do |_, block|
|
|
scheduled_at ? instrument(:enqueue_at, &block) : instrument(:enqueue, &block)
|
|
end
|
|
|
|
around_perform do |_, block|
|
|
instrument :perform_start
|
|
instrument :perform, &block
|
|
end
|
|
end
|
|
|
|
private
|
|
def instrument(operation, payload = {}, &block)
|
|
enhanced_block = ->(event_payload) do
|
|
value = block.call if block
|
|
|
|
if defined?(@_halted_callback_hook_called) && @_halted_callback_hook_called
|
|
event_payload[:aborted] = true
|
|
@_halted_callback_hook_called = nil
|
|
end
|
|
|
|
value
|
|
end
|
|
|
|
ActiveSupport::Notifications.instrument \
|
|
"#{operation}.active_job", payload.merge(adapter: queue_adapter, job: self), &enhanced_block
|
|
end
|
|
|
|
def halted_callback_hook(*)
|
|
super
|
|
@_halted_callback_hook_called = true
|
|
end
|
|
end
|
|
end
|