diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-26 18:19:16 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-26 18:19:16 +0000 |
| commit | fa69a57b46f4893c488445f79d6d290463820f7d (patch) | |
| tree | 4a73ccd1f8ffb4dbb47a42c6edb309238828a44e /config/initializers | |
| parent | 34283a71d9ac31eb4da0b59d0b25fc2be014bc9c (diff) | |
| download | gitlab-ce-fa69a57b46f4893c488445f79d6d290463820f7d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/sidekiq.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index cf8df814990..b2baccf886f 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -32,8 +32,6 @@ queues_config_hash = Gitlab::Redis::Queues.params queues_config_hash[:namespace] = Gitlab::Redis::Queues::SIDEKIQ_NAMESPACE enable_json_logs = Gitlab.config.sidekiq.log_format == 'json' -enable_sidekiq_memory_killer = ENV['SIDEKIQ_MEMORY_KILLER_MAX_RSS'].to_i.nonzero? && - !Gitlab::Utils.to_boolean(ENV['GITLAB_MEMORY_WATCHDOG_ENABLED'], default: true) Sidekiq.configure_server do |config| config[:strict] = false @@ -70,8 +68,6 @@ Sidekiq.configure_server do |config| # To cancel job, it requires `SIDEKIQ_MONITOR_WORKER=1` to enable notification channel Gitlab::SidekiqDaemon::Monitor.instance.start - Gitlab::SidekiqDaemon::MemoryKiller.instance.start if enable_sidekiq_memory_killer - first_sidekiq_worker = !ENV['SIDEKIQ_WORKER_ID'] || ENV['SIDEKIQ_WORKER_ID'] == '0' health_checks = Settings.monitoring.sidekiq_health_checks |