diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-23 15:11:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-23 15:11:34 +0300 |
| commit | 2c29837ce1692790dedccbc9b36b44dc8aaacbee (patch) | |
| tree | 779a007b58f6f7ec95f0058291309d20637f918d /lib/gitlab/memory | |
| parent | abbb493d78e42f044d732c7ad46917300cca1516 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/memory')
| -rw-r--r-- | lib/gitlab/memory/watchdog/configurator.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/memory/watchdog/configurator.rb b/lib/gitlab/memory/watchdog/configurator.rb index da3733731a7..b6917873e5a 100644 --- a/lib/gitlab/memory/watchdog/configurator.rb +++ b/lib/gitlab/memory/watchdog/configurator.rb @@ -53,7 +53,7 @@ module Gitlab memory_limit = ENV.fetch('PUMA_WORKER_MAX_MEMORY', 1200).to_i stack.push Gitlab::Memory::Watchdog::Monitor::RssMemoryLimit, - memory_limit: memory_limit, + memory_limit: memory_limit.megabytes, max_strikes: max_strikes end end |