diff --git a/CHANGELOG.md b/CHANGELOG.md index bc41602..64fddb6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # master (unreleased) +# 2.0.0 (2023-10-7) + +## BREAKING CHANGES + * Sidekiq 7+ support, refaactor to use Sidekiq's new internal middleware API. This means that this gem is no longer compatible with Sidekiq 6.5 or earlier. If you need to use earlier versions please use the 1.2 version of this gem. [@acallaghan] + # 1.2.0 (2017-12-17) * [#16](https://github.com/influitive/apartment-sidekiq/pull/16): Sidekiq::Batch compatibility [@mperham] diff --git a/apartment-sidekiq.gemspec b/apartment-sidekiq.gemspec index 9a7ebe2..e3e2b1a 100644 --- a/apartment-sidekiq.gemspec +++ b/apartment-sidekiq.gemspec @@ -23,5 +23,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'minitest' spec.add_dependency 'ros-apartment', '>= 1.0' - spec.add_dependency 'sidekiq', '>= 2.11' + spec.add_dependency 'sidekiq', '>= 7.0' end diff --git a/lib/apartment/sidekiq/middleware/client.rb b/lib/apartment/sidekiq/middleware/client.rb index f4666fa..331bc05 100644 --- a/lib/apartment/sidekiq/middleware/client.rb +++ b/lib/apartment/sidekiq/middleware/client.rb @@ -1,7 +1,9 @@ module Apartment::Sidekiq::Middleware class Client - def call(worker_class, item, queue, redis_pool=nil) - item["apartment"] ||= Apartment::Tenant.current + include Sidekiq::ClientMiddleware + + def call(job_class, msg, queue, redis_pool) + msg["apartment"] ||= Apartment::Tenant.current yield end end diff --git a/lib/apartment/sidekiq/middleware/server.rb b/lib/apartment/sidekiq/middleware/server.rb index 31efd03..2a6ca7e 100644 --- a/lib/apartment/sidekiq/middleware/server.rb +++ b/lib/apartment/sidekiq/middleware/server.rb @@ -1,7 +1,9 @@ module Apartment::Sidekiq::Middleware class Server - def call(worker_class, item, queue) - Apartment::Tenant.switch(item['apartment']) do + include Sidekiq::ServerMiddleware + + def call(job_instance, msg, queue) + Apartment::Tenant.switch(msg['apartment']) do yield end end diff --git a/lib/apartment/sidekiq/version.rb b/lib/apartment/sidekiq/version.rb index 7231e01..63b26be 100644 --- a/lib/apartment/sidekiq/version.rb +++ b/lib/apartment/sidekiq/version.rb @@ -1,5 +1,5 @@ module Apartment module Sidekiq - VERSION = "1.2.0" + VERSION = "2.0.0" end end