aboutsummaryrefslogtreecommitdiffstats
path: root/activejob/lib
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2017-06-04 16:12:40 +0200
committerGitHub <noreply@github.com>2017-06-04 16:12:40 +0200
commit704209b017277f3404dacded2b0bb5c6d81aeb6d (patch)
tree13588b7d79a1986b3429aa5a671f80418515fecb /activejob/lib
parent51abe8fe6ea997ad879eb5a19842144047268117 (diff)
parentb6b0c99ff3e8ace3f42813154dbe4b8ad6a98e6c (diff)
downloadrails-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/lib')
-rw-r--r--activejob/lib/active_job/logging.rb2
-rw-r--r--activejob/lib/active_job/queue_name.rb4
-rw-r--r--activejob/lib/active_job/queue_priority.rb2
3 files changed, 4 insertions, 4 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.
#