diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/metrics/samplers/unicorn_sampler.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/metrics/system.rb | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lib/gitlab/metrics/samplers/unicorn_sampler.rb b/lib/gitlab/metrics/samplers/unicorn_sampler.rb index 1b6c52ac0bf..a149dbf20f3 100644 --- a/lib/gitlab/metrics/samplers/unicorn_sampler.rb +++ b/lib/gitlab/metrics/samplers/unicorn_sampler.rb @@ -58,7 +58,7 @@ module Gitlab end def unicorn_workers_count - Sys::ProcTable.ps.select {|p| p.cmdline.match(/unicorn_rails worker.+ #{Rails.root.to_s}/)}.count + Sys::ProcTable.ps(smaps: false).select {|p| p.cmdline.match(/unicorn_rails worker.+ #{Rails.root.to_s}/)}.count end end end diff --git a/lib/gitlab/metrics/system.rb b/lib/gitlab/metrics/system.rb index ce0bb82d138..48dae3b23ad 100644 --- a/lib/gitlab/metrics/system.rb +++ b/lib/gitlab/metrics/system.rb @@ -33,7 +33,14 @@ module Gitlab end def self.process_start_time + stat_string = File.read('/proc/self/stat') + start_time = stat_string.scan(/\S*/).reject { |match| match.empty? }[21] + puts "!!!!" * 100 + puts "start_time from stat: #{start_time}" start_time_in_jiffies = Sys::ProcTable.ps(pid: Process.pid).starttime + + puts "!!!!" * 100 + puts "start_time from sysproctable: #{start_time_in_jiffies}" return 0 unless start_time_in_jiffies start_time_in_jiffies / 100 |