diff options
author | Stan Hu <stanhu@gmail.com> | 2018-02-06 21:39:50 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2018-02-06 21:39:50 +0300 |
commit | 8999d8eb5ec7aa51a4e28350d981c241f5993045 (patch) | |
tree | e61528dbdf26dce0c66b38671c91152bd92c306e /lib | |
parent | dffd5669c7942cd46f084c9d12b28b4b8fb8c7f8 (diff) | |
parent | 876854285f694d47430f348c0946be5f3e21e12a (diff) |
Merge branch 'dm-sidekiq-memory-killer-getcwd' into 'master'
Explicitly set cwd in Sidekiq memory killer instead of depending on getcwd
See merge request gitlab-org/gitlab-ce!16954
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/sidekiq_middleware/memory_killer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/sidekiq_middleware/memory_killer.rb b/lib/gitlab/sidekiq_middleware/memory_killer.rb index 2bfb7caefd9..b89ae2505c9 100644 --- a/lib/gitlab/sidekiq_middleware/memory_killer.rb +++ b/lib/gitlab/sidekiq_middleware/memory_killer.rb @@ -45,7 +45,7 @@ module Gitlab private def get_rss - output, status = Gitlab::Popen.popen(%W(ps -o rss= -p #{pid})) + output, status = Gitlab::Popen.popen(%W(ps -o rss= -p #{pid}), Rails.root.to_s) return 0 unless status.zero? output.to_i |