diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2018-02-22 18:08:23 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-22 18:08:23 -0500 |
commit | 5aa605f5cb5c15a0fa906463eb4afcaebe7c7796 (patch) | |
tree | 18dcb8781dad5ec75238ad43660abfc0ba9436ea | |
parent | ae01c921fb12021e46407f6d17ff68528156017d (diff) | |
parent | 6a1e7292bc3dbf9963c9aa8de75662ce1496a7c7 (diff) | |
download | rails-5aa605f5cb5c15a0fa906463eb4afcaebe7c7796.tar.gz rails-5aa605f5cb5c15a0fa906463eb4afcaebe7c7796.tar.bz2 rails-5aa605f5cb5c15a0fa906463eb4afcaebe7c7796.zip |
Merge pull request #32090 from bogdanvlviv/remove-passing-extra-arguments-to-active-job-callbacks
Remove passing extra arguments to ActiveJob Callbacks
-rw-r--r-- | activejob/lib/active_job/logging.rb | 4 | ||||
-rw-r--r-- | activejob/lib/active_job/timezones.rb | 2 | ||||
-rw-r--r-- | activejob/lib/active_job/translation.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/activejob/lib/active_job/logging.rb b/activejob/lib/active_job/logging.rb index 96c48d04a7..3312857ac7 100644 --- a/activejob/lib/active_job/logging.rb +++ b/activejob/lib/active_job/logging.rb @@ -11,13 +11,13 @@ module ActiveJob included do cattr_accessor :logger, default: ActiveSupport::TaggedLogging.new(ActiveSupport::Logger.new(STDOUT)) - around_enqueue do |_, block, _| + around_enqueue do |_, block| tag_logger do block.call end end - around_perform do |job, block, _| + around_perform do |job, block| tag_logger(job.class.name, job.job_id) do payload = { adapter: job.class.queue_adapter, job: job } ActiveSupport::Notifications.instrument("perform_start.active_job", payload.dup) diff --git a/activejob/lib/active_job/timezones.rb b/activejob/lib/active_job/timezones.rb index 83f459aea5..ac018eb752 100644 --- a/activejob/lib/active_job/timezones.rb +++ b/activejob/lib/active_job/timezones.rb @@ -5,7 +5,7 @@ module ActiveJob extend ActiveSupport::Concern included do - around_perform do |job, block, _| + around_perform do |job, block| Time.use_zone(job.timezone, &block) end end diff --git a/activejob/lib/active_job/translation.rb b/activejob/lib/active_job/translation.rb index fb45c80d67..0fd9b9fc06 100644 --- a/activejob/lib/active_job/translation.rb +++ b/activejob/lib/active_job/translation.rb @@ -5,7 +5,7 @@ module ActiveJob extend ActiveSupport::Concern included do - around_perform do |job, block, _| + around_perform do |job, block| I18n.with_locale(job.locale, &block) end end |