Add reconnect

HypeMC · HypeMC · commit bc7fad55015f · 2025-03-25T23:33:36.000+01:00
diff --git a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/Connection.php
@@ -16,6 +16,7 @@
 use Pheanstalk\Contract\PheanstalkSubscriberInterface;
 use Pheanstalk\Contract\SocketFactoryInterface;
 use Pheanstalk\Exception;
+use Pheanstalk\Exception\ConnectionException;
 use Pheanstalk\Pheanstalk;
 use Pheanstalk\Values\Job as PheanstalkJob;
 use Pheanstalk\Values\JobId;
@@ -137,19 +138,17 @@ public function send(string $body, array $headers, int $delay = 0, ?int $priorit
             throw new TransportException($exception->getMessage(), 0, $exception);
         }
 
-        try {
+        return $this->withReconnect(function () use ($message, $delay, $priority) {
             $this->client->useTube($this->tube);
             $job = $this->client->put(
                 $message,
                 $priority ?? PheanstalkPublisherInterface::DEFAULT_PRIORITY,
                 (int) ($delay / 1000),
                 $this->ttr
             );
-        } catch (Exception $exception) {
-            throw new TransportException($exception->getMessage(), 0, $exception);
-        }
 
-        return $job->getId();
+            return $job->getId();
+        });
     }
 
     public function get(): ?array
@@ -177,7 +176,7 @@ public function get(): ?array
 
     private function getFromTube(): ?PheanstalkJob
     {
-        try {
+        return $this->withReconnect(function () {
             if ($this->client->watch($this->tube) > 1) {
                 foreach ($this->client->listTubesWatched() as $tube) {
                     if ((string) $tube !== (string) $this->tube) {
@@ -187,66 +186,69 @@ private function getFromTube(): ?PheanstalkJob
             }
 
             return $this->client->reserveWithTimeout($this->timeout);
-        } catch (Exception $exception) {
-            throw new TransportException($exception->getMessage(), 0, $exception);
-        }
+        });
     }
 
     public function ack(string $id): void
     {
-        try {
+        $this->withReconnect(function () use ($id) {
             $this->client->useTube($this->tube);
             $this->client->delete(new JobId($id));
-        } catch (Exception $exception) {
-            throw new TransportException($exception->getMessage(), 0, $exception);
-        }
+        });
     }
 
     public function reject(string $id, ?int $priority = null, bool $forceDelete = false): void
     {
-        try {
+        $this->withReconnect(function () use ($id, $priority, $forceDelete) {
             $this->client->useTube($this->tube);
 
             if (!$forceDelete && $this->buryOnReject) {
                 $this->client->bury(new JobId($id), $priority ?? PheanstalkPublisherInterface::DEFAULT_PRIORITY);
             } else {
                 $this->client->delete(new JobId($id));
             }
-        } catch (Exception $exception) {
-            throw new TransportException($exception->getMessage(), 0, $exception);
-        }
+        });
     }
 
     public function keepalive(string $id): void
     {
-        try {
+        $this->withReconnect(function () use ($id) {
             $this->client->useTube($this->tube);
             $this->client->touch(new JobId($id));
-        } catch (Exception $exception) {
-            throw new TransportException($exception->getMessage(), 0, $exception);
-        }
+        });
     }
 
     public function getMessageCount(): int
     {
-        try {
+        return $this->withReconnect(function () {
             $this->client->useTube($this->tube);
             $tubeStats = $this->client->statsTube($this->tube);
-        } catch (Exception $exception) {
-            throw new TransportException($exception->getMessage(), 0, $exception);
-        }
 
-        return $tubeStats->currentJobsReady;
+            return $tubeStats->currentJobsReady;
+        });
     }
 
     public function getMessagePriority(string $id): int
     {
-        try {
+        return $this->withReconnect(function () use ($id) {
             $jobStats = $this->client->statsJob(new JobId($id));
+
+            return $jobStats->priority;
+        });
+    }
+
+    private function withReconnect(callable $command): mixed
+    {
+        try {
+            try {
+                return $command();
+            } catch (ConnectionException) {
+                $this->client->disconnect();
+
+                return $command();
+            }
         } catch (Exception $exception) {
             throw new TransportException($exception->getMessage(), 0, $exception);
         }
-
-        return $jobStats->priority;
     }
 }
