Expose error kind on RedisError

amphp · Aug 20, 2023 · a9df23e · a9df23e
1 parent 4ef9222
commit a9df23e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/Protocol/RedisError.php b/src/Protocol/RedisError.php
@@ -17,6 +17,18 @@ public function unwrap(): never
  throw new QueryException($this->message);
  }
 
+ public function getKind(): ?string
+ {
+ $prefix = \strtok($this->message, ' ');
+
+ // This is just a convention of Redis server, not part of the protocol
+ if ($prefix === \strtoupper($prefix)) {
+ return $prefix;
+ }
+
+ return null;
+ }
+
  public function getMessage(): string
  {
  return $this->message;

diff --git a/src/RedisClient.php b/src/RedisClient.php
@@ -794,7 +794,7 @@ public function eval(string $script, array $keys = [], array $args = []): mixed
 
  $response = $this->link->execute('evalsha', [$sha1, \count($keys), ...$keys, ...$args]);
 
- if ($response instanceof RedisError && \strtok($response->getMessage(), ' ') === 'NOSCRIPT') {
+ if ($response instanceof RedisError && $response->getKind() === 'NOSCRIPT') {
  return $this->execute('eval', $script, \count($keys), ...$keys, ...$args);
  }