techhub/mastodon
2
0
Fork 0
Code Activity

Fix jobs being added to batch after they might already execute (#35496)

Browse Source
This commit is contained in:
Eugen Rochko
2025-07-28 10:20:12 +02:00
committed by GitHub
parent a57a9505d4
commit 018e5e303f
4 changed files with 52 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/initializers/sidekiq.rb
View File

@@ -1,6 +1,7 @@
# frozen_string_literal: true
require_relative '../../lib/mastodon/sidekiq_middleware'
require_relative '../../lib/mastodon/worker_batch_middleware'
Sidekiq.configure_server do |config|
config.redis = REDIS_CONFIGURATION.sidekiq
@@ -72,14 +73,12 @@ Sidekiq.configure_server do |config|
config.server_middleware do |chain|
chain.add Mastodon::SidekiqMiddleware
end
config.server_middleware do |chain|
chain.add SidekiqUniqueJobs::Middleware::Server
end
config.client_middleware do |chain|
chain.add SidekiqUniqueJobs::Middleware::Client
chain.add Mastodon::WorkerBatchMiddleware
end
config.on(:startup) do
@@ -105,6 +104,7 @@ Sidekiq.configure_client do |config|
config.client_middleware do |chain|
chain.add SidekiqUniqueJobs::Middleware::Client
chain.add Mastodon::WorkerBatchMiddleware
end
config.logger.level = Logger.const_get(ENV.fetch('RAILS_LOG_LEVEL', 'info').upcase.to_s)