diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-02-06 18:39:50 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-02-14 14:21:43 -0600 |
| commit | aa9864b15646e0fbb9288db06fdf3a82238bd163 (patch) | |
| tree | cf05de01beae767df4e0cc9e00abc8acd052065e | |
| parent | 9609d1b03508aee363b6a9ad88cdbc414fd25ccc (diff) | |
| download | gitlab-ce-aa9864b15646e0fbb9288db06fdf3a82238bd163.tar.gz | |
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
| -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 |