diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-11 00:07:23 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-11 00:07:23 +0300 |
commit | 99bd45e7ce7539f3a0b7f7b710f1230464367b59 (patch) | |
tree | b5337e76c2a326b31c1890d154881ff68d388bc7 /lib/gitlab/memory | |
parent | 8cc4a6f23d41a1c57dc309130d2ce9ebc04d8334 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/memory')
-rw-r--r-- | lib/gitlab/memory/watchdog.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/memory/watchdog.rb b/lib/gitlab/memory/watchdog.rb index 3682d6e4462..c94dbed1d46 100644 --- a/lib/gitlab/memory/watchdog.rb +++ b/lib/gitlab/memory/watchdog.rb @@ -65,7 +65,7 @@ module Gitlab while @alive sleep(sleep_time_seconds) - monitor if Feature.enabled?(:gitlab_memory_watchdog, type: :ops) + monitor end event_reporter.stopped(log_labels(memwd_reason: @stop_reason).compact) |