Initialize Sidekiq 6 error_handler

the same way its CLI does.
reidmorrison · Jul 4, 2024 · 9cce078 · 9cce078
1 parent 34ffd8e
commit 9cce078
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/lib/rails_semantic_logger/engine.rb b/lib/rails_semantic_logger/engine.rb
@@ -114,7 +114,7 @@ class Engine < ::Rails::Engine
         end
 
         ::Sidekiq.configure_server do |config|
-          config.logger               = ::SemanticLogger[::Sidekiq]
+          config.logger = ::SemanticLogger[::Sidekiq]
           if config.respond_to?(:options)
             config.options[:job_logger] = RailsSemanticLogger::Sidekiq::JobLogger
           else

diff --git a/lib/rails_semantic_logger/sidekiq/defaults.rb b/lib/rails_semantic_logger/sidekiq/defaults.rb
@@ -31,7 +31,7 @@ def self.delete_default_error_handler(error_handlers)
 
         return unless defined?(::Sidekiq::ExceptionHandler)
         existing = error_handlers.find { |handler| handler.is_a?(::Sidekiq::ExceptionHandler::Logger) }
-        return config.error_handlers.delete(existing) if existing
+        return error_handlers.delete(existing) if existing
       end
     end
   end

diff --git a/test/sidekiq_test.rb b/test/sidekiq_test.rb
@@ -92,7 +92,7 @@ class SidekiqTest < Minitest::Test
             message:    "Start #perform",
             metric:     "sidekiq.queue.latency",
             named_tags: {jid: nil, queue: "default"},
-            exception:        :nil
+            exception:  :nil
           )
           assert messages[0].metric_amount.is_a?(Float)
 

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -2,6 +2,10 @@
 ENV["DISABLE_DATABASE_ENVIRONMENT_CHECK"] = "1"
 # Load first so Sidekiq thinks it is running as a server instance
 require "sidekiq/cli"
+if defined?(Sidekiq::DEFAULT_ERROR_HANDLER)
+  # Set by Sidekiq CLI at startup
+  Sidekiq.options[:error_handlers] << Sidekiq::DEFAULT_ERROR_HANDLER
+end
 require_relative "dummy/config/environment"
 
 require "rails/test_help"