From 13ba3bd4fdaa59b2836efa907433d5e807ed5d5e Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Thu, 23 Jun 2016 10:37:20 -0400
Subject: [PATCH] Use number_to_human_size for system info and remove
dependency on Filesize gem.
---
Gemfile | 1 -
Gemfile.lock | 2 --
app/controllers/admin/system_info_controller.rb | 8 ++++----
app/views/admin/system_info/show.html.haml | 4 ++--
app/views/layouts/nav/_admin.html.haml | 2 +-
5 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/Gemfile b/Gemfile
index ffc3514a198..a2386770992 100644
--- a/Gemfile
+++ b/Gemfile
@@ -349,4 +349,3 @@ gem 'health_check', '~> 1.5.1'
# System information
gem 'vmstat', '~> 2.1.0'
-gem 'filesize', '~> 0.1.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index afc1dce1710..c1d2f1fdf5a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -207,7 +207,6 @@ GEM
multi_json
ffaker (2.0.0)
ffi (1.9.10)
- filesize (0.1.1)
flay (2.6.1)
ruby_parser (~> 3.0)
sexp_processor (~> 4.0)
@@ -851,7 +850,6 @@ DEPENDENCIES
email_spec (~> 1.6.0)
factory_girl_rails (~> 4.6.0)
ffaker (~> 2.0.0)
- filesize (~> 0.1.1)
flay
flog
fog-aws (~> 0.9)
diff --git a/app/controllers/admin/system_info_controller.rb b/app/controllers/admin/system_info_controller.rb
index ab05ed2612a..b7333139c57 100644
--- a/app/controllers/admin/system_info_controller.rb
+++ b/app/controllers/admin/system_info_controller.rb
@@ -3,10 +3,10 @@ class Admin::SystemInfoController < Admin::ApplicationController
system_info = Vmstat.snapshot
@load = system_info.load_average.collect { |v| v.round(2) }.join(', ')
- @mem_used = Filesize.from("#{system_info.memory.active_bytes} B").to_f('GB').round
- @mem_total = Filesize.from("#{system_info.memory.total_bytes} B").to_f('GB').round
+ @mem_used = system_info.memory.active_bytes
+ @mem_total = system_info.memory.total_bytes
- @disk_used = Filesize.from("#{system_info.disks[0].used_bytes} B").to_f('GB').round
- @disk_total = Filesize.from("#{system_info.disks[0].total_bytes} B").to_f('GB').round
+ @disk_used = system_info.disks[0].used_bytes
+ @disk_total = system_info.disks[0].total_bytes
end
end
diff --git a/app/views/admin/system_info/show.html.haml b/app/views/admin/system_info/show.html.haml
index 316a94f4d41..542498cfb22 100644
--- a/app/views/admin/system_info/show.html.haml
+++ b/app/views/admin/system_info/show.html.haml
@@ -14,9 +14,9 @@
.light-well
%h4 Memory
.data
- %h1= "#{@mem_used}GB / #{@mem_total}GB"
+ %h1= "#{number_to_human_size(@mem_used)} / #{number_to_human_size(@mem_total)}"
.col-sm-4
.light-well
%h4 Disk
.data
- %h1= "#{@disk_used}GB / #{@disk_total}GB"
+ %h1= "#{number_to_human_size(@disk_used)} / #{number_to_human_size(@disk_total)}"
diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml
index e6c5ec06252..5ee8772882e 100644
--- a/app/views/layouts/nav/_admin.html.haml
+++ b/app/views/layouts/nav/_admin.html.haml
@@ -10,7 +10,7 @@
%span
Overview
= nav_link(controller: %w(system_info background_jobs logs health_check)) do
- = link_to admin_background_jobs_path, title: 'Monitoring' do
+ = link_to admin_system_info_path, title: 'Monitoring' do
%span
Monitoring
= nav_link(controller: :broadcast_messages) do
--
GitLab