Move RedisSocketException to Connection\RedisChannelException

amphp · Aug 20, 2023 · 758d594 · 758d594
1 parent 5b408fa
commit 758d594
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 18 deletions.
diff --git a/src/Connection/ReconnectingRedisLink.php b/src/Connection/ReconnectingRedisLink.php
@@ -8,7 +8,6 @@
 use Amp\Future;
 use Amp\Redis\Protocol\RedisResponse;
 use Amp\Redis\RedisException;
-use Amp\Redis\RedisSocketException;
 use Revolt\EventLoop;
 
 final class ReconnectingRedisLink implements RedisLink
@@ -121,7 +120,7 @@ private function run(): void
                     }
                 }
             } catch (\Throwable $exception) {
-                $exception = new RedisSocketException($exception->getMessage(), 0, $exception);
+                $exception = new RedisChannelException($exception->getMessage(), 0, $exception);
 
                 while (!$queue->isEmpty()) {
                     /** @var DeferredFuture $deferred */

diff --git a/src/Connection/RedisChannelException.php b/src/Connection/RedisChannelException.php
@@ -0,0 +1,9 @@
+<?php declare(strict_types=1);
+
+namespace Amp\Redis\Connection;
+
+use Amp\Redis\RedisException;
+
+final class RedisChannelException extends RedisException
+{
+}
diff --git a/src/Connection/SocketRedisChannel.php b/src/Connection/SocketRedisChannel.php
@@ -11,7 +11,6 @@
 use Amp\Redis\Protocol\RedisResponse;
 use Amp\Redis\Protocol\RespParser;
 use Amp\Redis\RedisException;
-use Amp\Redis\RedisSocketException;
 use Amp\Socket\Socket;
 use Revolt\EventLoop;
 
@@ -65,7 +64,7 @@ public function receive(): ?RedisResponse
     public function send(string ...$args): void
     {
         if ($this->socket->isClosed()) {
-            throw new RedisSocketException('Redis connection already closed');
+            throw new RedisChannelException('Redis connection already closed');
         }
 
         $payload = \implode("\r\n", \array_map(fn (string $arg) => '$' . \strlen($arg) . "\r\n" . $arg, $args));
@@ -74,7 +73,7 @@ public function send(string ...$args): void
         try {
             $this->socket->write($payload);
         } catch (StreamException $e) {
-            throw new RedisSocketException($e->getMessage(), 0, $e);
+            throw new RedisChannelException($e->getMessage(), 0, $e);
         }
     }
 

diff --git a/src/Connection/SocketRedisConnector.php b/src/Connection/SocketRedisConnector.php
@@ -7,7 +7,6 @@
 use Amp\ForbidCloning;
 use Amp\ForbidSerialization;
 use Amp\Redis\RedisException;
-use Amp\Redis\RedisSocketException;
 use Amp\Socket;
 use Amp\Socket\ConnectContext;
 use Amp\Socket\SocketConnector;
@@ -30,15 +29,15 @@ public function __construct(
     /**
      * @throws CancelledException
      * @throws RedisException
-     * @throws RedisSocketException
+     * @throws RedisChannelException
      */
     public function connect(?Cancellation $cancellation = null): RedisChannel
     {
         try {
             $socketConnector = $this->socketConnector ?? Socket\socketConnector();
             $socket = $socketConnector->connect($this->uri, $this->connectContext, $cancellation);
         } catch (Socket\SocketException $e) {
-            throw new RedisSocketException(
+            throw new RedisChannelException(
                 'Failed to connect to redis instance (' . $this->uri . ')',
                 0,
                 $e

diff --git a/src/RedisSocketException.php b/src/RedisSocketException.php
diff --git a/src/RedisSubscriber.php b/src/RedisSubscriber.php
@@ -7,6 +7,7 @@
 use Amp\Future;
 use Amp\Pipeline\Queue;
 use Amp\Redis\Connection\RedisChannel;
+use Amp\Redis\Connection\RedisChannelException;
 use Amp\Redis\Connection\RedisConnector;
 use Revolt\EventLoop;
 use function Amp\async;
@@ -144,7 +145,7 @@ private function run(): void
                     }
                 }
             } catch (\Throwable $exception) {
-                $exception = new RedisSocketException($exception->getMessage(), 0, $exception);
+                $exception = new RedisChannelException($exception->getMessage(), 0, $exception);
 
                 $queueGroups = \array_merge($queues, $patternQueues);
 

diff --git a/test/AuthTest.php b/test/AuthTest.php
@@ -5,6 +5,7 @@
 use Amp\PHPUnit\AsyncTestCase;
 use Amp\Process\Process;
 use Amp\Redis\Command\RedisCommands;
+use Amp\Redis\Connection\RedisChannelException;
 use function Amp\delay;
 
 class AuthTest extends AsyncTestCase
@@ -47,7 +48,7 @@ public function testFailure(): void
     {
         $redis = new RedisCommands(createRedisClient(\sprintf(self::URI_FORMAT, self::PORT, 'wrong')));
 
-        $this->expectException(RedisSocketException::class);
+        $this->expectException(RedisChannelException::class);
 
         $this->expectExceptionMessage('invalid');
 

diff --git a/test/DownTest.php b/test/DownTest.php
@@ -4,12 +4,13 @@
 
 use Amp\PHPUnit\AsyncTestCase;
 use Amp\Redis\Command\RedisCommands;
+use Amp\Redis\Connection\RedisChannelException;
 
 class DownTest extends AsyncTestCase
 {
     public function test(): void
     {
-        $this->expectException(RedisSocketException::class);
+        $this->expectException(RedisChannelException::class);
 
         $redis = new RedisCommands(createRedisClient('tcp://127.0.0.1:25325'));
         $redis->ping();