Commit cc7aec8e authored by charlie ablett's avatar charlie ablett

Merge branch 'fix-sidekiq-json-logging' into 'master'

Fix Sidekiq JSON logging

See merge request gitlab-org/gitlab!82819
parents e5964bcf db32e959
...@@ -30,8 +30,6 @@ Sidekiq.configure_server do |config| ...@@ -30,8 +30,6 @@ Sidekiq.configure_server do |config|
config.options[:strict] = false config.options[:strict] = false
config.options[:queues] = Gitlab::SidekiqConfig.expand_queues(config.options[:queues]) config.options[:queues] = Gitlab::SidekiqConfig.expand_queues(config.options[:queues])
Sidekiq.logger.info "Listening on queues #{config.options[:queues].uniq.sort}"
if enable_json_logs if enable_json_logs
config.log_formatter = Gitlab::SidekiqLogging::JSONFormatter.new config.log_formatter = Gitlab::SidekiqLogging::JSONFormatter.new
config.options[:job_logger] = Gitlab::SidekiqLogging::StructuredLogger config.options[:job_logger] = Gitlab::SidekiqLogging::StructuredLogger
...@@ -41,6 +39,8 @@ Sidekiq.configure_server do |config| ...@@ -41,6 +39,8 @@ Sidekiq.configure_server do |config|
config.error_handlers.reject! { |handler| handler.is_a?(Sidekiq::ExceptionHandler::Logger) } config.error_handlers.reject! { |handler| handler.is_a?(Sidekiq::ExceptionHandler::Logger) }
end end
Sidekiq.logger.info "Listening on queues #{config.options[:queues].uniq.sort}"
config.redis = queues_config_hash config.redis = queues_config_hash
config.server_middleware(&Gitlab::SidekiqMiddleware.server_configurator( config.server_middleware(&Gitlab::SidekiqMiddleware.server_configurator(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment