mirror/UNIT3D-Community-Edition
1
0
Fork 0
mirror of https://github.com/HDInnovations/UNIT3D-Community-Edition.git synced 2026-04-22 10:08:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: don't hard error if the php process can't access /proc/

Browse Source 
And a little bit of cleanup as well.
This commit is contained in:
Roardom
2025-12-18 08:22:06 +00:00
parent fa0eee2c76
commit 27fb1c4e6c
2 changed files with 56 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Helpers/SystemInformation.php
+55 -40
View File
@@ -37,7 +37,7 @@ class SystemInformation
];
/**
* @return null|array{
* @return array{
* '1-minute': string,
* '5-minute': string,
* '15-minute': string,
@@ -45,28 +45,25 @@ class SystemInformation
*/
public function avg(): ?array
{
// cspell:ignore loadavg
if (is_readable('/proc/loadavg')) {
$file = file_get_contents('/proc/loadavg');
if ($file === false) {
return null;
}
$loads = explode(' ', $file);
$loads = sys_getloadavg();
if ($loads === false) {
return [
'1-minute' => $loads[0],
'5-minute' => $loads[1],
'15-minute' => $loads[2],
'1-minute' => __('common.unknown'),
'5-minute' => __('common.unknown'),
'15-minute' => __('common.unknown'),
];
}
return null;
return [
'1-minute' => number_format($loads[0], 2),
'5-minute' => number_format($loads[1], 2),
'15-minute' => number_format($loads[2], 2),
];
}
/**
* @return null|array{
* @return array{
* total: string,
* available: string,
* used: string,
@@ -74,29 +71,33 @@ class SystemInformation
*/
public function memory(): ?array
{
if (is_readable('/proc/meminfo')) {
$content = file_get_contents('/proc/meminfo');
if ($content === false) {
return null;
}
preg_match('#^MemTotal: \s*(\d*)#m', $content, $matches);
$total = ((int) $matches[1]) * 1_024;
preg_match('/^MemAvailable: \s*(\d*)/m', $content, $matches);
$available = ((int) $matches[1]) * 1_024;
if (!is_readable('/proc/meminfo')) {
return [
'total' => $this->formatBytes($total),
'available' => $this->formatBytes($available),
'used' => $this->formatBytes($total - $available),
'total' => __('common.unknown'),
'available' => __('common.unknown'),
'used' => __('common.unknown'),
];
}
$content = file_get_contents('/proc/meminfo');
if ($content === false) {
return [
'total' => __('common.unknown'),
'available' => __('common.unknown'),
'used' => __('common.unknown'),
];
}
preg_match('#^MemTotal: \s*(\d*)#m', $content, $matches);
$total = ((int) $matches[1]) * 1_024;
preg_match('/^MemAvailable: \s*(\d*)/m', $content, $matches);
$available = ((int) $matches[1]) * 1_024;
return [
'total' => '0',
'available' => '0',
'used' => '0',
'total' => $this->formatBytes($total),
'available' => $this->formatBytes($available),
'used' => $this->formatBytes($total - $available),
];
}
@@ -124,20 +125,34 @@ class SystemInformation
$total = disk_total_space(base_path());
$free = disk_free_space(base_path());
if ($total === false || $free === false) {
return [
'total' => __('common.unknown'),
'free' => __('common.unknown'),
'used' => __('common.unknown'),
];
}
return [
'total' => $this->formatBytes($total ?: 0),
'free' => $this->formatBytes($free ?: 0),
'used' => $this->formatBytes(($total ?: 0) - ($free ?: 0)),
'total' => $this->formatBytes($total),
'free' => $this->formatBytes($free),
'used' => $this->formatBytes($total - $free),
];
}
public function uptime(): ?float
{
if (is_readable('/proc/uptime')) {
return (float) file_get_contents('/proc/uptime');
if (!is_readable('/proc/uptime')) {
return null;
}
return null;
$uptime = file_get_contents('/proc/uptime');
if ($uptime === false) {
return null;
}
return (float) $uptime;
}
/**
@@ -213,7 +228,7 @@ class SystemInformation
try {
return substr(\sprintf('%o', fileperms(base_path($path))), -4);
} catch (Exception) {
return trans('site.error');
return __('common.unknown');
}
}
}
resources/views/partials/footer.blade.php
+1 -1
View File
@@ -247,7 +247,7 @@
<span>{{ number_format(memory_get_peak_usage(true) / 1024 / 1024, 2) }} MiB</span>
<strong>Load:</strong>
<span>
{{ implode(' ', array_map(fn ($n) => number_format($n, 2), sys_getloadavg())) }}
{{ implode(' ', array_map(fn ($n) => number_format($n, 2), sys_getloadavg() ?: [])) ?: __('common.unknown') }}
</span>
<strong>Date:</strong>
<span>{{ now() }}</span>