diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-06-04 16:12:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-04 16:12:40 +0200 |
| commit | 704209b017277f3404dacded2b0bb5c6d81aeb6d (patch) | |
| tree | 13588b7d79a1986b3429aa5a671f80418515fecb /activejob | |
| parent | 51abe8fe6ea997ad879eb5a19842144047268117 (diff) | |
| parent | b6b0c99ff3e8ace3f42813154dbe4b8ad6a98e6c (diff) | |
| download | rails-704209b017277f3404dacded2b0bb5c6d81aeb6d.tar.gz rails-704209b017277f3404dacded2b0bb5c6d81aeb6d.tar.bz2 rails-704209b017277f3404dacded2b0bb5c6d81aeb6d.zip | |
Merge pull request #29294 from gsamokovarov/attributes-default
Introduce mattr_accessor default option
Diffstat (limited to 'activejob')
| -rw-r--r-- | activejob/lib/active_job/logging.rb | 2 | ||||
| -rw-r--r-- | activejob/lib/active_job/queue_name.rb | 4 | ||||
| -rw-r--r-- | activejob/lib/active_job/queue_priority.rb | 2 | ||||
| -rw-r--r-- | activejob/test/support/delayed_job/delayed/backend/test.rb | 3 |
4 files changed, 5 insertions, 6 deletions
diff --git a/activejob/lib/active_job/logging.rb b/activejob/lib/active_job/logging.rb index f46d5c68a8..ddc4915fd3 100644 --- a/activejob/lib/active_job/logging.rb +++ b/activejob/lib/active_job/logging.rb @@ -8,7 +8,7 @@ module ActiveJob extend ActiveSupport::Concern included do - cattr_accessor(:logger) { ActiveSupport::TaggedLogging.new(ActiveSupport::Logger.new(STDOUT)) } + cattr_accessor :logger, default: ActiveSupport::TaggedLogging.new(ActiveSupport::Logger.new(STDOUT)) around_enqueue do |_, block, _| tag_logger do diff --git a/activejob/lib/active_job/queue_name.rb b/activejob/lib/active_job/queue_name.rb index d83113af60..6f521a1c1a 100644 --- a/activejob/lib/active_job/queue_name.rb +++ b/activejob/lib/active_job/queue_name.rb @@ -4,8 +4,8 @@ module ActiveJob # Includes the ability to override the default queue name and prefix. module ClassMethods - mattr_accessor(:queue_name_prefix) - mattr_accessor(:default_queue_name) { "default" } + mattr_accessor :queue_name_prefix + mattr_accessor :default_queue_name, default: "default" # Specifies the name of the queue to process the job on. # diff --git a/activejob/lib/active_job/queue_priority.rb b/activejob/lib/active_job/queue_priority.rb index db8d9178a4..399d7a135a 100644 --- a/activejob/lib/active_job/queue_priority.rb +++ b/activejob/lib/active_job/queue_priority.rb @@ -4,7 +4,7 @@ module ActiveJob # Includes the ability to override the default queue priority. module ClassMethods - mattr_accessor(:default_priority) + mattr_accessor :default_priority # Specifies the priority of the queue to create the job with. # diff --git a/activejob/test/support/delayed_job/delayed/backend/test.rb b/activejob/test/support/delayed_job/delayed/backend/test.rb index 98d731ff1e..68288c062b 100644 --- a/activejob/test/support/delayed_job/delayed/backend/test.rb +++ b/activejob/test/support/delayed_job/delayed/backend/test.rb @@ -19,8 +19,7 @@ module Delayed include Delayed::Backend::Base - cattr_accessor :id - self.id = 0 + cattr_accessor :id, default: 0 def initialize(hash = {}) self.attempts = 0 |