diff options
Diffstat (limited to 'config/initializers/sidekiq.rb')
| -rw-r--r-- | config/initializers/sidekiq.rb | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 19c5e4df854..d33550b82d1 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -27,8 +27,14 @@ use_sidekiq_daemon_memory_killer = ENV.fetch("SIDEKIQ_DAEMON_MEMORY_KILLER", 1). use_sidekiq_legacy_memory_killer = !use_sidekiq_daemon_memory_killer Sidekiq.configure_server do |config| + config.options[:strict] = false + config.options[:queues] = Gitlab::SidekiqConfig.expand_queues(config.options[:queues]) + config.options[:scheduled_enq] = Gitlab::SidekiqEnq + + Sidekiq.logger.info "Listening on queues #{config.options[:queues].uniq.sort}" + if enable_json_logs - Sidekiq.logger.formatter = Gitlab::SidekiqLogging::JSONFormatter.new + config.log_formatter = Gitlab::SidekiqLogging::JSONFormatter.new config.options[:job_logger] = Gitlab::SidekiqLogging::StructuredLogger # Remove the default-provided handler. The exception is logged inside @@ -38,11 +44,11 @@ Sidekiq.configure_server do |config| config.redis = queues_config_hash - config.server_middleware(&Gitlab::SidekiqMiddleware.server_configurator({ + config.server_middleware(&Gitlab::SidekiqMiddleware.server_configurator( metrics: Settings.monitoring.sidekiq_exporter, arguments_logger: SidekiqLogArguments.enabled? && !enable_json_logs, memory_killer: enable_sidekiq_memory_killer && use_sidekiq_legacy_memory_killer - })) + )) config.client_middleware(&Gitlab::SidekiqMiddleware.client_configurator) |