From c4d2f74408021bbaf5438d38e669c96cd6214770 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 13 May 2021 20:41:41 +0100 Subject: [PATCH] Switch to new defaults for queue names --- config/initializers/action_mailer.rb | 3 +++ config/initializers/new_framework_defaults_6_1.rb | 13 ++----------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb index e15aaad49..e6ec032aa 100644 --- a/config/initializers/action_mailer.rb +++ b/config/initializers/action_mailer.rb @@ -1,3 +1,6 @@ +# Configure queue to use for ActionMailer deliveries +ActionMailer::Base.deliver_later_queue_name = :mailers + # Configure ActionMailer SMTP settings ActionMailer::Base.smtp_settings = { :address => Settings.smtp_address, diff --git a/config/initializers/new_framework_defaults_6_1.rb b/config/initializers/new_framework_defaults_6_1.rb index c40b62cb8..dd27b5e20 100644 --- a/config/initializers/new_framework_defaults_6_1.rb +++ b/config/initializers/new_framework_defaults_6_1.rb @@ -47,20 +47,11 @@ Rails.application.config.active_record.legacy_connection_handling = false # Make `form_with` generate non-remote forms by default. # Rails.application.config.action_view.form_with_generates_remote_forms = false -# Set the default queue name for the analysis job to the queue adapter default. -# Rails.application.config.active_storage.queues.analysis = nil - -# Set the default queue name for the purge job to the queue adapter default. -# Rails.application.config.active_storage.queues.purge = nil - # Set the default queue name for the incineration job to the queue adapter default. -# Rails.application.config.action_mailbox.queues.incineration = nil +Rails.application.config.action_mailbox.queues.incineration = nil # Set the default queue name for the routing job to the queue adapter default. -# Rails.application.config.action_mailbox.queues.routing = nil - -# Set the default queue name for the mail deliver job to the queue adapter default. -# Rails.application.config.action_mailer.deliver_later_queue_name = nil +Rails.application.config.action_mailbox.queues.routing = nil # Generate a `Link` header that gives a hint to modern browsers about # preloading assets when using `javascript_include_tag` and `stylesheet_link_tag`. -- 2.39.5