diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-08-20 17:25:04 +0200 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-08-21 12:05:30 +0200 |
| commit | c2cbfc5c4afbe8385659f97769db8450284639cf (patch) | |
| tree | 430ac243924b4b3fb4e389a9c763ea6bd484c2f0 /config | |
| parent | 75e2302d0126c4bc8ea215ffb4e72612d44e73bb (diff) | |
| download | gitlab-ce-c2cbfc5c4afbe8385659f97769db8450284639cf.tar.gz | |
Rework `Sidekiq::JobsThreads` into `Monitor`
This makes:
- very shallow `Middleware::Monitor` to only request tracking
of sidekiq jobs,
- `SidekiqStatus::Monitor` to be responsible to maintain persistent
connection to receive messages,
- `SidekiqStatus::Monitor` to always use structured logging
and instance variables
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/sidekiq.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index b05d4342e23..e145af5e2d5 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -33,7 +33,7 @@ Sidekiq.configure_server do |config| config.redis = queues_config_hash config.server_middleware do |chain| - chain.add Gitlab::SidekiqMiddleware::JobsThreads unless ENV['DISABLE_SIDEKIQ_INTERRUPT_RUNNING_JOBS'] + chain.add Gitlab::SidekiqMiddleware::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,7 +59,9 @@ Sidekiq.configure_server do |config| # Sidekiq (e.g. in an initializer). ActiveRecord::Base.clear_all_connections! - Gitlab::SidekiqStatus::Monitor.instance.start unless ENV['DISABLE_SIDEKIQ_INTERRUPT_RUNNING_JOBS'] + if ENV.fetch("SIDEKIQ_MONITOR_WORKER", 0).to_i.nonzero? + Gitlab::SidekiqMonitor.instance.start + end end if enable_reliable_fetch? |