diff options
Diffstat (limited to 'activejob')
| -rw-r--r-- | activejob/CHANGELOG.md | 17 | ||||
| -rw-r--r-- | activejob/lib/active_job/callbacks.rb | 4 | ||||
| -rw-r--r-- | activejob/lib/active_job/core.rb | 6 |
3 files changed, 14 insertions, 13 deletions
diff --git a/activejob/CHANGELOG.md b/activejob/CHANGELOG.md index c9d9484518..afdd42be33 100644 --- a/activejob/CHANGELOG.md +++ b/activejob/CHANGELOG.md @@ -1,8 +1,9 @@ -* `ActiveJob::Base.deserialize` delegates to the job class +* `ActiveJob::Base.deserialize` delegates to the job class - Since `ActiveJob::Base#deserialize` can be overriden by subclasses (like `ActiveJob::Base#serialize`) - this allows jobs to attach arbitrary metadata when they get serialized and read it back when they get - performed. E.g. + + Since `ActiveJob::Base#deserialize` can be overridden by subclasses (like + `ActiveJob::Base#serialize`) this allows jobs to attach arbitrary metadata + when they get serialized and read it back when they get performed. Example: class DeliverWebhookJob < ActiveJob::Base def serialize @@ -10,17 +11,17 @@ end def deserialize(job_data) - super(job_data) + super @attempt_number = job_data['attempt_number'] end - rescue_from(TimeoutError) do |ex| - raise ex if @attempt_number > 5 + rescue_from(TimeoutError) do |exception| + raise exception if @attempt_number > 5 retry_job(wait: 10) end end - *Isaac Seymour* + *Isaac Seymour* Please check [4-2-stable](https://github.com/rails/rails/blob/4-2-stable/activejob/CHANGELOG.md) for previous changes. diff --git a/activejob/lib/active_job/callbacks.rb b/activejob/lib/active_job/callbacks.rb index c4ceb484cc..2b6149e84e 100644 --- a/activejob/lib/active_job/callbacks.rb +++ b/activejob/lib/active_job/callbacks.rb @@ -3,8 +3,8 @@ require 'active_support/callbacks' module ActiveJob # = Active Job Callbacks # - # Active Job provides hooks during the lifecycle of a job. Callbacks allow you - # to trigger logic during the lifecycle of a job. Available callbacks are: + # Active Job provides hooks during the life cycle of a job. Callbacks allow you + # to trigger logic during the life cycle of a job. Available callbacks are: # # * <tt>before_enqueue</tt> # * <tt>around_enqueue</tt> diff --git a/activejob/lib/active_job/core.rb b/activejob/lib/active_job/core.rb index 450c56bfdc..ddd7d1361c 100644 --- a/activejob/lib/active_job/core.rb +++ b/activejob/lib/active_job/core.rb @@ -78,12 +78,12 @@ module ActiveJob # end # # def deserialize(job_data) - # super(job_data) + # super # @attempt_number = job_data['attempt_number'] # end # - # rescue_from(TimeoutError) do |ex| - # raise ex if @attempt_number > 5 + # rescue_from(TimeoutError) do |exception| + # raise exception if @attempt_number > 5 # retry_job(wait: 10) # end # end |