feat: pass service name to RejectedException

ackintosh · Jan 13, 2025 · ded6c90 · ded6c90
1 parent d171924
commit ded6c90
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 7 deletions.
diff --git a/src/Ganesha/Exception/RejectedException.php b/src/Ganesha/Exception/RejectedException.php
@@ -4,4 +4,22 @@
 
 class RejectedException extends \RuntimeException
 {
+    public function __construct(
+        string $message = "",
+        int $code = 0,
+        ?\Throwable $previous = null,
+        private ?string $serviceName = null,
+    ) {
+        parent::__construct($message, $code, $previous);
+    }
+
+    public static function withServiceName(string $serviceName): self
+    {
+        return new self(sprintf('"%s" is not available', $serviceName), serviceName: $serviceName);
+    }
+
+    public function serviceName(): ?string
+    {
+        return $this->serviceName;
+    }
 }
diff --git a/src/Ganesha/GaneshaHttpClient.php b/src/Ganesha/GaneshaHttpClient.php
@@ -59,7 +59,7 @@ public function request(string $method, string $url, array $options = []): Respo
         $serviceName = $this->serviceNameExtractor->extract($method, $url, $options);
 
         if (!$this->ganesha->isAvailable($serviceName)) {
-            throw new RejectedException(sprintf('"%s" is not available', $serviceName));
+            throw RejectedException::withServiceName($serviceName);
         }
 
         $response = $this->client->request($method, $url, $this->avoidGaneshaOptionsPropagation($options));

diff --git a/src/Ganesha/GuzzleMiddleware.php b/src/Ganesha/GuzzleMiddleware.php
@@ -69,9 +69,7 @@ public function __invoke(callable $handler): \Closure
             if (!$this->ganesha->isAvailable($serviceName)) {
                 return call_user_func(
                     $this->rejectionForFunction,
-                    new RejectedException(
-                        sprintf('"%s" is not available', $serviceName)
-                    )
+                    RejectedException::withServiceName($serviceName),
                 );
             }
 

diff --git a/tests/Ackintosh/Ganesha/GaneshaHttpClientTest.php b/tests/Ackintosh/Ganesha/GaneshaHttpClientTest.php
@@ -239,7 +239,7 @@ public function reject(): void
         $ganesha->failure($service);
         $ganesha->failure($service);
 
-        $this->expectException(RejectedException::class);
+        $this->expectExceptionObject(RejectedException::withServiceName($service));
         $client->request('GET', 'http://'.$service.'/awesome_resource');
     }
 

diff --git a/tests/Ackintosh/Ganesha/GuzzleMiddlewareTest.php b/tests/Ackintosh/Ganesha/GuzzleMiddlewareTest.php
@@ -155,8 +155,6 @@ public function recordsFailureOnRequestTimedOut()
      */
     public function reject()
     {
-        $this->expectException(RejectedException::class);
-
         // Build Ganesha which has count strategy with memcached adapter
         $m = new \Memcached();
         $m->addServer(
@@ -180,6 +178,8 @@ public function reject()
         $ganesha->failure($service);
         $ganesha->failure($service);
 
+        $this->expectExceptionObject(RejectedException::withServiceName($service));
+
         $client->get('http://' . $service . '/awesome_resource');
     }