diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-08-21 13:03:42 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-08-21 14:21:55 +0300 |
| commit | 8d17c4dae6b4662dddffe9e2ddca8100e8cd3d0b (patch) | |
| tree | f13731d3bdb703e868517403afd83f92d965ea7e /config | |
| parent | cb193cd6b54ee9ac0cf87650100585293540abfa (diff) | |
Properly handle `sidekiq` skip
Transform `CancelledError` into `JobRetry::Skip`
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/sidekiq.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index e145af5e2d5..9f3e104bc2b 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -28,12 +28,13 @@ if Rails.env.development? end enable_json_logs = Gitlab.config.sidekiq.log_format == 'json' +enable_sidekiq_monitor = ENV.fetch("SIDEKIQ_MONITOR_WORKER", 0).to_i.nonzero? Sidekiq.configure_server do |config| config.redis = queues_config_hash config.server_middleware do |chain| - chain.add Gitlab::SidekiqMiddleware::Monitor + chain.add Gitlab::SidekiqMiddleware::Monitor if enable_sidekiq_monitor chain.add Gitlab::SidekiqMiddleware::Metrics if Settings.monitoring.sidekiq_exporter chain.add Gitlab::SidekiqMiddleware::ArgumentsLogger if ENV['SIDEKIQ_LOG_ARGUMENTS'] && !enable_json_logs chain.add Gitlab::SidekiqMiddleware::MemoryKiller if ENV['SIDEKIQ_MEMORY_KILLER_MAX_RSS'] @@ -59,9 +60,7 @@ Sidekiq.configure_server do |config| # Sidekiq (e.g. in an initializer). ActiveRecord::Base.clear_all_connections! - if ENV.fetch("SIDEKIQ_MONITOR_WORKER", 0).to_i.nonzero? - Gitlab::SidekiqMonitor.instance.start - end + Gitlab::SidekiqMonitor.instance.start if enable_sidekiq_monitor end if enable_reliable_fetch? |