summaryrefslogtreecommitdiffstats
path: root/modules-available/dnbd3
diff options
context:
space:
mode:
authorSimon Rettberg2022-07-01 17:51:36 +0200
committerSimon Rettberg2022-07-01 17:51:36 +0200
commitcebc0c48fd86750eb9b45745a2d68c5e5d71d9f8 (patch)
tree778a2bc16e4fda122015908f89e7c7590d803701 /modules-available/dnbd3
parent[rebootcontrol] Fix permission check (diff)
downloadslx-admin-cebc0c48fd86750eb9b45745a2d68c5e5d71d9f8.tar.gz
slx-admin-cebc0c48fd86750eb9b45745a2d68c5e5d71d9f8.tar.xz
slx-admin-cebc0c48fd86750eb9b45745a2d68c5e5d71d9f8.zip
[dnbd3/vmstore] Add first version of speedtest/benchmark GUI
Diffstat (limited to 'modules-available/dnbd3')
-rw-r--r--modules-available/dnbd3/inc/dnbd3.inc.php2
-rw-r--r--modules-available/dnbd3/page.inc.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules-available/dnbd3/inc/dnbd3.inc.php b/modules-available/dnbd3/inc/dnbd3.inc.php
index 0c640973..7f873f23 100644
--- a/modules-available/dnbd3/inc/dnbd3.inc.php
+++ b/modules-available/dnbd3/inc/dnbd3.inc.php
@@ -31,7 +31,7 @@ class Dnbd3 {
$res = Database::simpleQuery('SELECT s.serverid, m.clientip, s.fixedip
FROM dnbd3_server s
LEFT JOIN machine m ON (s.machineuuid = m.machineuuid)
- WHERE s.lastseen > :cutoff', ['cutoff' => time() - 310]);
+ WHERE s.lastseen > :cutoff', ['cutoff' => CONFIG_DEBUG ? 0 : time() - 310]);
$lookup = [];
foreach ($res as $row) {
$lookup[$row['fixedip'] ?? $row['clientip'] ?? ''] = $row['serverid'];
diff --git a/modules-available/dnbd3/page.inc.php b/modules-available/dnbd3/page.inc.php
index 7173fc10..f8cabca5 100644
--- a/modules-available/dnbd3/page.inc.php
+++ b/modules-available/dnbd3/page.inc.php
@@ -623,7 +623,7 @@ class Page_Dnbd3 extends Page
private function ajaxStats()
{
$lookup = Dnbd3::getActiveServers();
- $result = Dnbd3Rpc::getStatsMulti(array_keys($lookup));
+ $result = Dnbd3Rpc::getStatsMulti(array_keys($lookup), [Dnbd3Rpc::QUERY_STATS]);
$return = [];
foreach ($result as $ip => $data) {
$return[$lookup[$ip]] = $data;