diff options
| author | Douwe Maan <douwe@selenight.nl> | 2018-02-06 11:14:45 -0600 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2018-02-06 11:14:45 -0600 |
| commit | 876854285f694d47430f348c0946be5f3e21e12a (patch) | |
| tree | 07b1b4d8e87f174185346acc7770fb1b39329494 | |
| parent | 4900390711305ec05e514e7077ab99713d68ff6b (diff) | |
| download | gitlab-ce-dm-sidekiq-memory-killer-getcwd.tar.gz | |
Explicitly set cwd in Sidekiq memory killer instead of depending on getcwddm-sidekiq-memory-killer-getcwd
| -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 |