diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-11 18:06:41 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-11 18:06:41 +0300 |
commit | cd631619f465a0eee2fe714e720f6b6312dd3e56 (patch) | |
tree | fdc5eb698c2e51fc38dda5a63a0b3f74abc143c3 /lib/gitlab/sidekiq_daemon | |
parent | f03a645e7409882fe8b1aceca1735bc9051c612a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/sidekiq_daemon')
-rw-r--r-- | lib/gitlab/sidekiq_daemon/memory_killer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/sidekiq_daemon/memory_killer.rb b/lib/gitlab/sidekiq_daemon/memory_killer.rb index 25b91318dfe..eb58435e3f1 100644 --- a/lib/gitlab/sidekiq_daemon/memory_killer.rb +++ b/lib/gitlab/sidekiq_daemon/memory_killer.rb @@ -39,8 +39,8 @@ module Gitlab while enabled? begin - restart_sidekiq unless rss_within_range? sleep(CHECK_INTERVAL_SECONDS) + restart_sidekiq unless rss_within_range? rescue => e log_exception(e, __method__) rescue Exception => e # rubocop:disable Lint/RescueException |