BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit aa9864b1 by Stan Hu Committed by Robert Speicher
Options

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
parent 9609d1b0
Showing with 1 addition and 1 deletion
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
......
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