From cebc0c48fd86750eb9b45745a2d68c5e5d71d9f8 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Fri, 1 Jul 2022 17:51:36 +0200 Subject: [dnbd3/vmstore] Add first version of speedtest/benchmark GUI --- modules-available/dnbd3/inc/dnbd3.inc.php | 2 +- modules-available/dnbd3/page.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'modules-available/dnbd3') 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; -- cgit v1.2.3-55-g7522