diff options
| author | Simon Rettberg | 2019-02-21 21:47:38 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-02-21 21:47:38 +0100 |
| commit | d5d84d8a78e3cb2a20a0aa496e5f2911167cd11f (patch) | |
| tree | 92a3fff18a9bec837a05db182b0294c8dbf19abc /modules-available/dnbd3/page.inc.php | |
| parent | [statistics] Improve display of non-client runmode machines (diff) | |
| download | slx-admin-d5d84d8a78e3cb2a20a0aa496e5f2911167cd11f.tar.gz slx-admin-d5d84d8a78e3cb2a20a0aa496e5f2911167cd11f.tar.xz slx-admin-d5d84d8a78e3cb2a20a0aa496e5f2911167cd11f.zip | |
[dnbd3] Show image idle time in proxy details
Diffstat (limited to 'modules-available/dnbd3/page.inc.php')
| -rw-r--r-- | modules-available/dnbd3/page.inc.php | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/modules-available/dnbd3/page.inc.php b/modules-available/dnbd3/page.inc.php index d8dd6cb8..d2e8162b 100644 --- a/modules-available/dnbd3/page.inc.php +++ b/modules-available/dnbd3/page.inc.php @@ -197,7 +197,7 @@ class Page_Dnbd3 extends Page $server['uptime'] += ($NOW - $server['dnbd3lastseen']); } $server['dnbd3lastseen_s'] = $server['dnbd3lastseen'] ? Util::prettyTime($server['dnbd3lastseen']) : '-'; - $server['uptime_s'] = $server['uptime'] ? floor($server['uptime'] / 86400) . 'd ' . gmdate('H:i', $server['uptime']) : '-'; + $server['uptime_s'] = $server['uptime'] ? Util::formatDuration($server['uptime']) : '-'; $server['totalup_s'] = Util::readableFileSize($server['totalup']); $server['totaldown_s'] = Util::readableFileSize($server['totaldown']); if ($server['disktotal'] > 0) { @@ -362,6 +362,15 @@ class Page_Dnbd3 extends Page $sort1 = $sort2 = []; foreach ($stats['images'] as &$image) { $image['size_s'] = Util::readableFileSize($image['size']); + if (isset($image['idle'])) { + if ($image['idle'] < 90) { + $image['idle_s'] = Dictionary::translate('now'); + } elseif ($image['idle'] < $stats['uptime']) { + $image['idle_s'] = Util::formatDuration($image['idle'], false); + } else { + $image['idle_s'] = '∞'; + } + } $sort1[] = $image['users']; $sort2[] = $image['name']; } |