aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Dupret <robin.dupret@gmail.com>2014-12-31 16:31:25 +0100
committerRobin Dupret <robin.dupret@gmail.com>2014-12-31 17:35:41 +0100
commitf2b31cd6d1f4b4b0a7095ec25456bd560587330a (patch)
tree689013d9f65ac91fd4dd1c9d650b7d64a4ad4723
parentc7a1f70fddb4935a7697d26846d832d1fc2e46e0 (diff)
downloadrails-f2b31cd6d1f4b4b0a7095ec25456bd560587330a.tar.gz
rails-f2b31cd6d1f4b4b0a7095ec25456bd560587330a.tar.bz2
rails-f2b31cd6d1f4b4b0a7095ec25456bd560587330a.zip
Tiny follow-up to #18260 [ci skip]
Indent the list content by 4 spaces instead of 2 to match the other changelog files. Also wrap the lines around 80 chars. Finally update the documentation example with nit-picky things.
-rw-r--r--activejob/CHANGELOG.md17
-rw-r--r--activejob/lib/active_job/core.rb6
2 files changed, 12 insertions, 11 deletions
diff --git a/activejob/CHANGELOG.md b/activejob/CHANGELOG.md
index be8c98963c..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 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. 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/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