diff options
author | Joas Schilling <coding@schilljs.com> | 2017-01-19 20:01:40 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-19 20:01:40 +0300 |
commit | 66f41eb82a0513da38414eb3b067a6a153e7722e (patch) | |
tree | 765d2c8dc7d78ae70882996d9facd1b5d18b01ff | |
parent | 6e6446b18c8d16c72d4e5d614bd12c2ba852d4c1 (diff) | |
parent | 1ea56f0f47cfcd6670a7b37bb37e6b6b689ef627 (diff) |
Merge pull request #76 from nextcloud/backport-71-proc-info-not-readablev11.0.3RC2v11.0.3RC1v11.0.3v11.0.2RC1v11.0.2
[stable11] Don't throw an error when /proc/meminfo is not readable
-rw-r--r-- | lib/SystemStatistics.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/SystemStatistics.php b/lib/SystemStatistics.php index 02c3c48..dd483a5 100644 --- a/lib/SystemStatistics.php +++ b/lib/SystemStatistics.php @@ -68,7 +68,7 @@ class SystemStatistics { * @return array with the two values 'mem_free' and 'mem_total' */ protected function getMemoryUsage() { - $memoryUsage = file_get_contents('/proc/meminfo'); + $memoryUsage = @file_get_contents('/proc/meminfo'); if ($memoryUsage === false) { return ['mem_free' => 'N/A', 'mem_total' => 'N/A']; } |