diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-01 21:12:02 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-01 21:12:02 +0300 |
| commit | fb7b3d71b179f877dca72d86eccf29eeb9f883b7 (patch) | |
| tree | 5d48b4763e2fd918b467b0955bc0e8b60fe771c9 /config/initializers | |
| parent | faa19db44a5a4d0fb7a3be07319ca6201caa185a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/memory_watchdog.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config/initializers/memory_watchdog.rb b/config/initializers/memory_watchdog.rb index 72779a18b10..82ad615ce25 100644 --- a/config/initializers/memory_watchdog.rb +++ b/config/initializers/memory_watchdog.rb @@ -13,7 +13,8 @@ Gitlab::Cluster::LifecycleEvents.on_worker_start do Gitlab::Memory::Watchdog::NullHandler.instance end - Gitlab::Memory::Watchdog.new( + watchdog = Gitlab::Memory::Watchdog.new( handler: handler, logger: Gitlab::AppLogger - ).start + ) + Gitlab::BackgroundTask.new(watchdog).start end |