lib/sidekiq/logstash.rb in sidekiq-logstash-1.2.1 vs lib/sidekiq/logstash.rb in sidekiq-logstash-2.0.0
- old
+ new
@@ -1,10 +1,9 @@
# frozen_string_literal: true
require 'sidekiq/logstash/configuration'
require 'sidekiq/logstash/version'
-require 'sidekiq/middleware/server/logstash_logging'
require 'sidekiq/logging/logstash_formatter'
require 'sidekiq/logging/argument_filter'
require 'sidekiq/logstash_job_logger'
module Sidekiq
@@ -25,18 +24,10 @@
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) }
# Add logstash support
- # The logging server middleware was removed in Sidekiq 5.0.0, see: https://github.com/mperham/sidekiq/blob/master/Changes.md
- if Sidekiq::Middleware::Server.const_defined?(:Logging)
- config.server_middleware do |chain|
- chain.add Sidekiq::Middleware::Server::LogstashLogging
- chain.remove Sidekiq::Middleware::Server::Logging
- end
- else
- Sidekiq.options[:job_logger] = Sidekiq::LogstashJobLogger
- end
+ config.options[:job_logger] = Sidekiq::LogstashJobLogger
# Set custom formatter for Sidekiq logger
config.logger.formatter = Sidekiq::Logging::LogstashFormatter.new
end
end