Commit 8999d8eb authored by Stan Hu's avatar Stan Hu

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
parents dffd5669 87685428
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment