diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-08-24 18:06:19 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-08-25 08:28:35 +0100 |
| commit | 085e1f89f327ad4d679696fe4673d09e1840b236 (patch) | |
| tree | 585a47ab6e78653692d249158cb0f689bdd573d3 /app/controllers/admin | |
| parent | b2bf01f4c271be66e93ed6f4b48a1da4d50e558d (diff) | |
| download | gitlab-ce-085e1f89f327ad4d679696fe4673d09e1840b236.tar.gz | |
Handle unavailable system info
For Linux with the grsecurity patches applied, paths in `/proc` may not
be readable, so handle those cases and show a message rather than
blowing up.
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/system_info_controller.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/app/controllers/admin/system_info_controller.rb b/app/controllers/admin/system_info_controller.rb index e4c73008826..ca04a17caa1 100644 --- a/app/controllers/admin/system_info_controller.rb +++ b/app/controllers/admin/system_info_controller.rb @@ -29,7 +29,8 @@ class Admin::SystemInfoController < Admin::ApplicationController ] def show - system_info = Vmstat.snapshot + @cpus = Vmstat.cpu rescue nil + @memory = Vmstat.memory rescue nil mounts = Sys::Filesystem.mounts @disks = [] @@ -50,10 +51,5 @@ class Admin::SystemInfoController < Admin::ApplicationController rescue Sys::Filesystem::Error end end - - @cpus = system_info.cpus.length - - @mem_used = system_info.memory.active_bytes - @mem_total = system_info.memory.total_bytes end end |