Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support Sidekiq 6.5 #31

Merged
merged 2 commits into from
Jun 9, 2022
Merged

Support Sidekiq 6.5 #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aae4d54
Fix tests to run with Sidekiq 6.5
iMacTia Jun 9, 2022
a9a6b9e
Deal with removed Sidekiq::ExceptionHandler::Logger in Sidekiq 6.5
iMacTia Jun 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .ruby-gemset
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion .ruby-version
View file
Open in desktop

This file was deleted.

7 changes: 5 additions & 2 deletions lib/sidekiq/logstash.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions spec/sidekiq/logstash_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) } }

Expand Down