[dnbd3] Show upload speed and client count in realtime

1 files changed, 16 insertions, 21 deletions

diff --git a/modules-available/dnbd3/page.inc.php b/modules-available/dnbd3/page.inc.php
index a58f6fcc..e90eff0f 100644
--- a/modules-available/dnbd3/page.inc.php
+++ b/modules-available/dnbd3/page.inc.php
@@ -492,6 +492,8 @@ class Page_Dnbd3 extends Page
 			$this->ajaxReboot();
 		} elseif ($action === 'cachemap') {
 			$this->ajaxCacheMap();
+		} elseif ($action === 'stats') {
+			$this->ajaxStats();
 		} else {
 			die($action . '???');
 		}
@@ -616,30 +618,23 @@ class Page_Dnbd3 extends Page
 		die($data);
 	}
 
-	private function genChunk($acc)
+	private function ajaxStats()
 	{
-		static $last = -1;
-		static $count = 0;
-		if ($acc !== false) {
-			if ($acc > 15) {
-				$acc = 15;
-			}
-			$acc = round($acc);
-			if ($last === $acc) {
-				$count++;
-				return '';
-			}
+		$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]);
+		$lookup = [];
+		foreach ($res as $row) {
+			$lookup[$row['fixedip'] ?? $row['clientip'] ?? ''] = $row['serverid'];
 		}
-		if ($last !== -1) {
-			if ($count === 1)
-				return '<b style="background:#0' . dechex($acc) . '0"></b>';
-			$line = '<b style="background:#0' . dechex($last) . '0;flex-grow:' . $count . '"></b>';
-		} else {
-			$line = '';
+		$result = Dnbd3Rpc::getStatsMulti(array_keys($lookup));
+		$return = [];
+		foreach ($result as $ip => $data) {
+			$return[$lookup[$ip]] = $data;
 		}
-		$last = $acc;
-		$count = 1;
-		return $line;
+		Header('Content-Type: application/json; charset=utf-8');
+		die(json_encode($return));
 	}
 
 }