wip

Author: michalsn

system/Cache/CacheFactory.php

@@ -86,9 +86,6 @@ public static function getHandler(Cache $config, ?string $handler = null, ?strin
             $adapter = self::getHandler($config, $backup, 'dummy');
         }
 
-        // Wrap with reconnect decorator for automatic reconnection on failure
-        $adapter = new ReconnectCacheDecorator($adapter);
-
         return $adapter;
     }
 }

system/Cache/Handlers/BaseHandler.php

@@ -87,4 +87,26 @@ public function remember(string $key, int $ttl, Closure $callback): mixed
 
         return $value;
     }
+
+    /**
+     * Check if connection is alive.
+     *
+     * Default implementation for handlers that don't require connection management.
+     * Handlers with persistent connections (Redis, Predis, Memcached) should override this.
+     */
+    public function ping(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Reconnect to the cache server.
+     *
+     * Default implementation for handlers that don't require connection management.
+     * Handlers with persistent connections (Redis, Predis, Memcached) should override this.
+     */
+    public function reconnect(): bool
+    {
+        return true;
+    }
 }

system/Cache/Handlers/MemcachedHandler.php

@@ -219,23 +219,40 @@ public function isSupported(): bool
         return extension_loaded('memcached') || extension_loaded('memcache');
     }
 
-    /**
-     * Reconnect to Memcached server
-     *
-     * Used by ReconnectCacheDecorator to restore connection after failure.
-     */
+    public function ping(): bool
+    {
+        if (! isset($this->memcached)) {
+            return false;
+        }
+
+        $version = $this->memcached->getVersion();
+
+        if ($this->memcached instanceof Memcached) {
+            // Memcached extension returns array with server:port => version
+            if (! is_array($version)) {
+                return false;
+            }
+
+            $serverKey = $this->config['host'] . ':' . $this->config['port'];
+
+            return isset($version[$serverKey]) && $version[$serverKey] !== false;
+        }
+
+        if ($this->memcached instanceof Memcache) {
+            // Memcache extension returns string version
+            return is_string($version) && $version !== false && $version !== '';
+        }
+
+        return false;
+    }
+
     public function reconnect(): bool
     {
-        // Close existing connection to avoid resource leak
         if (isset($this->memcached)) {
-            try {
-                if ($this->memcached instanceof Memcached) {
-                    $this->memcached->quit();
-                } elseif ($this->memcached instanceof Memcache) {
-                    $this->memcached->close();
-                }
-            } catch (Exception $e) {
-                // Connection already dead, that's fine
+            if ($this->memcached instanceof Memcached) {
+                $this->memcached->quit();
+            } elseif ($this->memcached instanceof Memcache) {
+                $this->memcached->close();
             }
         }
 

system/Cache/Handlers/PredisHandler.php

@@ -205,14 +205,27 @@ public function isSupported(): bool
         return class_exists(Client::class);
     }
 
-    /**
-     * Reconnect to Redis server via Predis
-     *
-     * Used by ReconnectCacheDecorator to restore connection after failure.
-     */
+    public function ping(): bool
+    {
+        if (! isset($this->redis)) {
+            return false;
+        }
+
+        try {
+            $result = $this->redis->ping();
+
+            if (is_object($result)) {
+                return $result->getPayload() === 'PONG';
+            }
+
+            return $result === 'PONG';
+        } catch (Exception $e) {
+            return false;
+        }
+    }
+
     public function reconnect(): bool
     {
-        // Disconnect existing connection to avoid resource leak
         if (isset($this->redis)) {
             try {
                 $this->redis->disconnect();

system/Cache/Handlers/RedisHandler.php

@@ -220,14 +220,23 @@ public function isSupported(): bool
         return extension_loaded('redis');
     }
 
-    /**
-     * Reconnect to Redis server
-     *
-     * Used by ReconnectCacheDecorator to restore connection after failure.
-     */
+    public function ping(): bool
+    {
+        if (! isset($this->redis)) {
+            return false;
+        }
+
+        try {
+            $result = $this->redis->ping();
+
+            return $result === true || $result === '+PONG' || $result === 'PONG';
+        } catch (RedisException $e) {
+            return false;
+        }
+    }
+
     public function reconnect(): bool
     {
-        // Close existing connection to avoid resource leak
         if (isset($this->redis)) {
             try {
                 $this->redis->close();

system/Cache/ReconnectCacheDecorator.php

@@ -394,8 +394,13 @@ public static function resetForWorkerMode(WorkerMode $config): void
 
         foreach (static::$instances as $serviceName => $service) {
             if ($serviceName === 'cache') {
-                // Only persist cache in keep-alive mode
                 if ($config->cacheStrategy === 'keep-alive') {
+                    // Ping the connection and reconnect if needed
+                    if (! $service->ping()) {
+                        $service->reconnect();
+                    }
+
+                    // Persist cache instance in keep-alive mode
                     $persistentInstances[$serviceName] = $service;
                 }
 

system/Config/BaseService.php

@@ -188,4 +188,19 @@ public function testGetMetaDataMiss(): void
     {
         $this->assertNull($this->handler->getMetaData(self::$dummy));
     }
+
+    public function testPing(): void
+    {
+        $this->assertTrue($this->handler->ping());
+    }
+
+    public function testReconnect(): void
+    {
+        $this->handler->save(self::$key1, 'value');
+        $this->assertSame('value', $this->handler->get(self::$key1));
+
+        $this->assertTrue($this->handler->reconnect());
+
+        $this->assertSame('value', $this->handler->get(self::$key1));
+    }
 }

tests/system/Cache/Handlers/MemcachedHandlerTest.php

@@ -184,4 +184,19 @@ public function testIsSupported(): void
     {
         $this->assertTrue($this->handler->isSupported());
     }
+
+    public function testPing(): void
+    {
+        $this->assertTrue($this->handler->ping());
+    }
+
+    public function testReconnect(): void
+    {
+        $this->handler->save(self::$key1, 'value');
+        $this->assertSame('value', $this->handler->get(self::$key1));
+
+        $this->assertTrue($this->handler->reconnect());
+
+        $this->assertSame('value', $this->handler->get(self::$key1));
+    }
 }

tests/system/Cache/Handlers/PredisHandlerTest.php

@@ -233,4 +233,19 @@ public function testIsSupported(): void
     {
         $this->assertTrue($this->handler->isSupported());
     }
+
+    public function testPing(): void
+    {
+        $this->assertTrue($this->handler->ping());
+    }
+
+    public function testReconnect(): void
+    {
+        $this->handler->save(self::$key1, 'value');
+        $this->assertSame('value', $this->handler->get(self::$key1));
+
+        $this->assertTrue($this->handler->reconnect());
+
+        $this->assertSame('value', $this->handler->get(self::$key1));
+    }
 }