summaryrefslogtreecommitdiff
path: root/app/controllers/admin
diff options
context:
space:
mode:
authorJosh Frye <joshfng@gmail.com>2016-06-23 10:56:41 -0400
committerJosh Frye <joshfng@gmail.com>2016-06-28 21:35:42 -0400
commit0aa0ace9bcca80af45e1060d2bfb730d3ef95836 (patch)
treeb34d96b957b3cafe62e886d8d051b0ebf6f4a76c /app/controllers/admin
parent13ba3bd4fdaa59b2836efa907433d5e807ed5d5e (diff)
downloadgitlab-ce-0aa0ace9bcca80af45e1060d2bfb730d3ef95836.tar.gz
Change load average to cpu/cores on system info.
Diffstat (limited to 'app/controllers/admin')
-rw-r--r--app/controllers/admin/system_info_controller.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/admin/system_info_controller.rb b/app/controllers/admin/system_info_controller.rb
index b7333139c57..3c67370b667 100644
--- a/app/controllers/admin/system_info_controller.rb
+++ b/app/controllers/admin/system_info_controller.rb
@@ -1,7 +1,8 @@
class Admin::SystemInfoController < Admin::ApplicationController
def show
system_info = Vmstat.snapshot
- @load = system_info.load_average.collect { |v| v.round(2) }.join(', ')
+
+ @cpus = system_info.cpus.length
@mem_used = system_info.memory.active_bytes
@mem_total = system_info.memory.total_bytes