Skip to content

Commit 71f33ac

Browse files
committed
Fix metrics when there are multiple server
1 parent 38f4ef6 commit 71f33ac

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

src/Dashboards/Memcached/MemcachedDashboard.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public function ajax(): string {
9494
}
9595

9696
if (isset($_GET['metrics'])) {
97-
return (new MemcachedMetrics($this->memcached))->collectAndRespond();
97+
return (new MemcachedMetrics($this->memcached, $this->servers, $this->current_server))->collectAndRespond();
9898
}
9999

100100
if (isset($_GET['deleteall'])) {

src/Dashboards/Memcached/MemcachedMetrics.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use JsonException;
1212
use PDO;
1313
use RobiNN\Pca\Config;
14+
use RobiNN\Pca\Helpers;
1415
use RobiNN\Pca\Http;
1516

1617
class MemcachedMetrics {
@@ -19,8 +20,12 @@ class MemcachedMetrics {
1920
private const RATE_COMMANDS = ['get', 'set', 'delete', 'incr', 'decr', 'cas', 'touch', 'flush'];
2021
private const HIT_RATE_COMMANDS = ['get', 'delete', 'incr', 'decr', 'cas', 'touch'];
2122

22-
public function __construct(private readonly PHPMem $memcached) {
23-
$hash = md5(Config::get('hash', 'pca')); // This isn't really safe, but it's better than nothing
23+
/**
24+
* @param array<int, array<string, int|string>> $servers
25+
*/
26+
public function __construct(private readonly PHPMem $memcached, array $servers, int $selected) {
27+
$server_name = Helpers::getServerTitle($servers[$selected]);
28+
$hash = md5($server_name.Config::get('hash', 'pca')); // This isn't really safe, but it's better than nothing
2429
$db = __DIR__.'/../../../tmp/memcached_metrics'.$hash.'.db';
2530

2631
$this->pdo = new PDO('sqlite:'.$db);

0 commit comments

Comments
 (0)