More tests

Author: RobiNN1

src/Dashboards/AnalysisTrait.php

@@ -18,12 +18,16 @@ trait AnalysisTrait {
      */
     private array $top_thresholds = [];
 
+    /**
+     * Cutoffs left over from a previous run would silently drop rows from the next one, so every analysis has to start with this.
+     */
+    private function resetTopThresholds(): void {
+        $this->top_thresholds = [];
+    }
+
     /**
      * Collect a row only if it can still make the top list.
      *
-     * A keyspace can hold hundreds of thousands of keys, so buffering every one of them just to sort
-     * out the largest handful is what would actually run the process out of memory.
-     *
      * @param array<int, array<string, mixed>> $buffer
      * @param array<string, mixed>             $row
      */

src/Dashboards/Memcached/MemcachedAnalysis.php

@@ -94,6 +94,8 @@ public function analyzeKeys(array $lines): array {
         $separator = $this->servers[$this->current_server]['separator'] ?? ':';
         $time = time();
 
+        $this->resetTopThresholds();
+
         $analyzed = 0;
         $total_memory = 0;
         $no_expiry = ['count' => 0, 'memory' => 0];

src/Dashboards/Memcached/MemcachedHealth.php

@@ -17,7 +17,7 @@ trait MemcachedHealth {
      *
      * @return array<int, array<string, mixed>>
      */
-    private function getHealthChecks(array $info): array {
+    public function getHealthChecks(array $info): array {
         return [
             $this->memoryCheck($info),
             $this->hitRateCheck($info),

src/Dashboards/Memcached/MemcachedKeysList.php

@@ -56,7 +56,7 @@ public function keysTableView(array $raw_lines): array {
 
         foreach ($raw_lines as $line) {
             $key_data = $this->memcached->parseLine($line);
-            $ttl = $key_data['exp'] ?? null;
+            $ttl = $key_data['exp'] ?? -1;
             $ttl_display = $ttl === -1 ? 'Doesn\'t expire' : $ttl - $time;
 
             $formatted_keys[] = [
@@ -99,7 +99,7 @@ public function keysTreeView(array $raw_lines): array {
                 continue;
             }
 
-            $ttl = $key_data['exp'] ?? null;
+            $ttl = $key_data['exp'] ?? -1;
 
             $keys[] = [
                 'key'  => $key_data['key'],

src/Dashboards/Memcached/MemcachedMetrics.php

@@ -27,10 +27,6 @@ public function __construct(
         parent::__construct($servers, $selected);
     }
 
-    protected function dbPrefix(): string {
-        return 'memcached';
-    }
-
     protected function schema(): string {
         return <<<SQL
         CREATE TABLE IF NOT EXISTS metrics (

src/Dashboards/Metrics.php

@@ -26,7 +26,9 @@ public function __construct(array $servers, int $selected) {
         $server_name = Helpers::getServerTitle($servers[$selected]);
         $hash = md5($server_name.Config::get('hash', 'pca'));
         $dir = Config::get('metricsdir', __DIR__.'/../../tmp/metrics');
-        $db = $dir.'/'.$this->dbPrefix().'_metrics_'.$hash.'.db';
+
+        $prefix = strtolower(str_replace('Metrics', '', substr((string) strrchr(static::class, '\\'), 1)));
+        $db = $dir.'/'.$prefix.'_metrics_'.$hash.'.db';
 
         if (!is_dir($dir) && !mkdir($dir, 0777, true) && !is_dir($dir)) {
             throw new RuntimeException(sprintf('Directory "%s" was not created', $dir));
@@ -39,11 +41,6 @@ public function __construct(array $servers, int $selected) {
         $this->pdo->exec('CREATE INDEX IF NOT EXISTS metrics_timestamp ON metrics (timestamp)');
     }
 
-    /**
-     * Prefix for the database file name, e.g. "redis".
-     */
-    abstract protected function dbPrefix(): string;
-
     /**
      * "CREATE TABLE" statement for the metrics table.
      */

src/Dashboards/OPCache/OPCacheHealth.php

@@ -13,16 +13,19 @@
 
 trait OPCacheHealth {
     /**
+     * @param array<string, mixed>|null $status
+     * @param array<string, mixed>|null $directives
+     *
      * @return array<int, array<string, mixed>>
      */
-    private function getHealthChecks(): array {
-        $status = opcache_get_status(false);
+    public function getHealthChecks(?array $status = null, ?array $directives = null): array {
+        $status ??= opcache_get_status(false) ?: null;
 
-        if ($status === false) {
+        if ($status === null) {
             return [];
         }
 
-        $directives = opcache_get_configuration()['directives'];
+        $directives ??= opcache_get_configuration()['directives'];
         $memory = $status['memory_usage'];
         $stats = $status['opcache_statistics'];
 

src/Dashboards/Redis/RedisAnalysis.php

@@ -345,6 +345,7 @@ public function analyzeKeys(array $keys, array $pipeline, int $depth, int $total
             'hash_limit' => $context['hash_limit'] ?? null,
         ];
 
+        $this->resetTopThresholds();
         $stats = $this->emptyStats();
 
         foreach ($keys as $key) {

src/Dashboards/Redis/RedisClients.php

@@ -81,7 +81,7 @@ private function killClient(string $id): void {
      *
      * @return array<string, mixed>
      */
-    private function formatClient(array $client): array {
+    public function formatClient(array $client): array {
         $age = (int) ($client['age'] ?? 0);
         $idle = (int) ($client['idle'] ?? 0);
         $memory = (int) ($client['tot-mem'] ?? 0);

src/Dashboards/Redis/RedisHealth.php

@@ -17,7 +17,7 @@ trait RedisHealth {
      *
      * @return array<int, array<string, mixed>>
      */
-    private function getHealthChecks(array $info): array {
+    public function getHealthChecks(array $info): array {
         $memory = $info['memory'] ?? [];
         $stats = $info['stats'] ?? [];
         $clients = $info['clients'] ?? [];