Skip to content

Commit 9cce078

Browse files
committed
Initialize Sidekiq 6 error_handler
the same way its CLI does.
1 parent 34ffd8e commit 9cce078

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

lib/rails_semantic_logger/engine.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ class Engine < ::Rails::Engine
114114
end
115115

116116
::Sidekiq.configure_server do |config|
117-
config.logger = ::SemanticLogger[::Sidekiq]
117+
config.logger = ::SemanticLogger[::Sidekiq]
118118
if config.respond_to?(:options)
119119
config.options[:job_logger] = RailsSemanticLogger::Sidekiq::JobLogger
120120
else

lib/rails_semantic_logger/sidekiq/defaults.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def self.delete_default_error_handler(error_handlers)
3131

3232
return unless defined?(::Sidekiq::ExceptionHandler)
3333
existing = error_handlers.find { |handler| handler.is_a?(::Sidekiq::ExceptionHandler::Logger) }
34-
return config.error_handlers.delete(existing) if existing
34+
return error_handlers.delete(existing) if existing
3535
end
3636
end
3737
end

test/sidekiq_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ class SidekiqTest < Minitest::Test
9292
message: "Start #perform",
9393
metric: "sidekiq.queue.latency",
9494
named_tags: {jid: nil, queue: "default"},
95-
exception: :nil
95+
exception: :nil
9696
)
9797
assert messages[0].metric_amount.is_a?(Float)
9898

test/test_helper.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
ENV["DISABLE_DATABASE_ENVIRONMENT_CHECK"] = "1"
33
# Load first so Sidekiq thinks it is running as a server instance
44
require "sidekiq/cli"
5+
if defined?(Sidekiq::DEFAULT_ERROR_HANDLER)
6+
# Set by Sidekiq CLI at startup
7+
Sidekiq.options[:error_handlers] << Sidekiq::DEFAULT_ERROR_HANDLER
8+
end
59
require_relative "dummy/config/environment"
610

711
require "rails/test_help"

0 commit comments

Comments
 (0)