Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Added support for multiple spree background queues

Damian Legawiec7239168a215a
diff --git a/core/app/jobs/spree/base_job.rb b/core/app/jobs/spree/base_job.rb
index 2fd4aaef50..642867e1d2 100644
--- a/core/app/jobs/spree/base_job.rb
+++ b/core/app/jobs/spree/base_job.rb
@@ -1,5 +1,5 @@
module Spree
class BaseJob < ApplicationJob
- queue_as Spree.default_queue_name
+ queue_as Spree.queues.default
end
end
diff --git a/core/app/jobs/spree/coupon_codes/bulk_generate_job.rb b/core/app/jobs/spree/coupon_codes/bulk_generate_job.rb
index 88140fcad2..0e67317b12 100644
--- a/core/app/jobs/spree/coupon_codes/bulk_generate_job.rb
+++ b/core/app/jobs/spree/coupon_codes/bulk_generate_job.rb
@@ -1,6 +1,8 @@
module Spree
module CouponCodes
class BulkGenerateJob < Spree::BaseJob
+ queue_as Spree.queues.coupon_codes
+
def perform(promotion_id, quantity)
promotion = Spree::Promotion.find(promotion_id)
return unless promotion.present?
diff --git a/core/app/jobs/spree/stock_locations/stock_items/create_job.rb b/core/app/jobs/spree/stock_locations/stock_items/create_job.rb
index fa656ae603..70e5e2ac1f 100644
--- a/core/app/jobs/spree/stock_locations/stock_items/create_job.rb
+++ b/core/app/jobs/spree/stock_locations/stock_items/create_job.rb
@@ -2,6 +2,8 @@ module Spree
module StockLocations
module StockItems
class CreateJob < Spree::BaseJob
+ queue_as Spree.queues.stock_location_stock_items
+
def perform(stock_location)
Spree::StockLocations::StockItems::Create.call(stock_location: stock_location)
end
diff --git a/core/lib/generators/spree/install/templates/config/initializers/spree.rb b/core/lib/generators/spree/install/templates/config/initializers/spree.rb
index 21edd6939a..76548e017f 100644
--- a/core/lib/generators/spree/install/templates/config/initializers/spree.rb
+++ b/core/lib/generators/spree/install/templates/config/initializers/spree.rb
@@ -18,8 +18,9 @@ Spree.config do |config|
# config.track_inventory_levels = false
end
-# Background job queue name
-# Spree.default_queue_name = 'default'
+# Background job queue names
+# Spree.queues.stock_location_stock_items = 'default'
+# Spree.queues.coupon_codes = 'default'
# Use a CDN host for images, eg. Cloudfront
# This is used in the frontend to generate absolute URLs to images
diff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rb
index 5e2abefeef..0896af99fe 100644
--- a/core/lib/spree/core.rb
+++ b/core/lib/spree/core.rb
@@ -29,7 +29,7 @@ StateMachines::Machine.ignore_method_conflicts = true
module Spree
mattr_accessor :user_class, :admin_user_class, :private_storage_service_name,
:public_storage_service_name, :cdn_host, :searcher_class,
- :default_queue_name
+ :queues
def self.user_class(constantize: true)
if @@user_class.is_a?(Class)
@@ -69,8 +69,12 @@ module Spree
end
end
- def self.default_queue_name
- @@default_queue_name ||= 'default'
+ def self.queues
+ @@queues ||= OpenStruct.new(
+ default: :default,
+ stock_location_stock_items: :default,
+ coupon_codes: :default
+ )
end
def self.searcher_class(constantize: true)
diff --git a/core/spec/jobs/spree/stock_locations/stock_items/create_job_spec.rb b/core/spec/jobs/spree/stock_locations/stock_items/create_job_spec.rb
index 7b424c69cb..e85690cdfa 100644
--- a/core/spec/jobs/spree/stock_locations/stock_items/create_job_spec.rb
+++ b/core/spec/jobs/spree/stock_locations/stock_items/create_job_spec.rb
@@ -6,7 +6,7 @@ module Spree
it 'enqueues the creation of the stock location stock items' do
expect { described_class.perform_later(stock_location) }.to(
- have_enqueued_job.on_queue('spree_stock_location_stock_items')
+ have_enqueued_job.on_queue(Spree.queues.stock_location_stock_items)
)
end
end