Support Sidekiq 6.5 (#31)

* Fix tests to run with Sidekiq 6.5 * Deal with removed Sidekiq::ExceptionHandler::Logger in Sidekiq 6.5 Fixes #30
iMacTia · Jun 9, 2022 · cfc42b1 · cfc42b1
1 parent 6b1523d
commit cfc42b1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.ruby-gemset b/.ruby-gemset
diff --git a/.ruby-version b/.ruby-version
diff --git a/lib/sidekiq/logstash.rb b/lib/sidekiq/logstash.rb
@@ -22,8 +22,11 @@ def self.configure
     def self.setup(_opts = {})
       # Calls Sidekiq.configure_server to inject logics
       Sidekiq.configure_server do |config|
-        # Remove default Sidekiq error_handler that logs errors
-        config.error_handlers.delete_if { |h| h.is_a?(Sidekiq::ExceptionHandler::Logger) }
+        if defined?(Sidekiq::ExceptionHandler::Logger)
+          # Remove default Sidekiq error_handler that logs errors
+          # NOTE: this only exists up until Sidekiq 6.4.x
+          config.error_handlers.delete_if { |h| h.is_a?(Sidekiq::ExceptionHandler::Logger) }
+        end
 
         # Add logstash support
         config.options[:job_logger] = Sidekiq::LogstashJobLogger

diff --git a/spec/sidekiq/logstash_spec.rb b/spec/sidekiq/logstash_spec.rb
@@ -13,8 +13,8 @@ def process(worker, params = [], encrypt: false)
   let(:buffer) { StringIO.new }
   let(:logger) { Logger.new(buffer) }
   let(:job) { build(:job) }
-  let(:processor_options) { { queues: ['default'] } }
-  let(:processor) { ::Sidekiq::Processor.new(nil, processor_options) }
+  let(:processor_options) { Sidekiq }
+  let(:processor) { ::Sidekiq::Processor.new(processor_options) }
   let(:log_message) { JSON.parse(buffer.string) }
   let(:log_messages) { buffer.string.split("\n").map { |log| JSON.parse(log) } }